diff --git a/C4/Auth.pm b/C4/Auth.pm
index 61cc3d27c8..6cc0fab05b 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -86,9 +86,10 @@ sub checkauth {
 	    $sti=$dbh->prepare("select value from sessionqueries where sessionID=? and userid=?");
 	    $sti->execute($sessionID, $userid);
 	    if ($sti->rows) {
+		my ($selfurl) = $sti->fetchrow;
 		my $stj=$dbh->prepare("delete from sessionqueries where sessionID=?");
 		$stj->execute($sessionID);
-		my ($selfurl) = $sti->fetchrow;
+		($selfurl) || ($selfurl=$ENV{'SCRIPT_NAME'});
 		print $query->redirect($selfurl);
 		exit;
 	    }
diff --git a/installer.pl b/installer.pl
index e3b001d4ce..4bab2cc27e 100644
--- a/installer.pl
+++ b/installer.pl
@@ -929,6 +929,24 @@ chmod 0750, "$kohadir/scripts/z3950daemon/processz3950queue";
 chown(0, (getpwnam($httpduser)) [3], "$kohadir/scripts/z3950daemon/z3950-daemon-shell.sh") or warn "can't chown $kohadir/scripts/z3950daemon/z3950-daemon-shell.sh: $!";
 chown(0, (getpwnam($httpduser)) [3], "$kohadir/scripts/z3950daemon/processz3950queue") or warn "can't chown $kohadir/scripts/z3950daemon/processz3950queue: $!";
 
+print qq|
+
+==================
+= Authentication =
+==================
+
+This release of Koha has a new authentication module.  If you are not already
+using basic authentication on your intranet, you will be required to log in to
+access some of the features of the intranet.  You can log in using the userid
+and password from the /etc/koha.conf configuration file at any time.  Use the
+"Members" module to add passwords for other accounts and set their permissions.
+
+[NOTE PERMISSIONS ARE NOT COMPLETED AS OF 1.2.3RC1.  Do not give passwords to
+ any patrons unless you want them to have full access to your intranet.]
+|;
+print "Press the <ENTER> key to continue: ";
+<STDIN>;
+
 
 #RESTART APACHE
 print "\n\n";
diff --git a/sampledata-1.2 b/sampledata-1.2
index d2c4656c8c..1a10c992fe 100644
--- a/sampledata-1.2
+++ b/sampledata-1.2
@@ -2245,9 +2245,9 @@ INSERT INTO bibliosubject VALUES ('COSTUME-HISTORY',498);
 # Dumping data for table 'borrowers'
 #
 
-INSERT INTO borrowers VALUES (1,'V10000008','Tonnesen','Steve',' ','','','asdfasdf',NULL,'asdf','','','',NULL,NULL,NULL,'','0000-00-00','','','2002-06-25',NULL,NULL,NULL,NULL,NULL,'asdf','',NULL,'L','','','M','2003-06-25','','workplace','','',NULL,NULL);
-INSERT INTO borrowers VALUES (2,'V10000019','Doe','Jane','Ms','','','PO Box 333',NULL,'Somewhere, BC','','','',NULL,NULL,NULL,'','0000-00-00','','','2002-06-25',0,0,0,NULL,NULL,'Mr. Buddy Boy','',NULL,'L','','','M','2003-06-25','','workplace','','',NULL,'PO Box 333');
-INSERT INTO borrowers VALUES (3,'V1000002X','Smith','John','Mr','','','PO Box 782',NULL,'Somewhere, BC','','','',NULL,NULL,NULL,'','0000-00-00','','','2002-06-25',NULL,NULL,NULL,NULL,NULL,'Mr. Buddy Boy','',NULL,'L','','','M','2003-06-25','','workplace','','',NULL,NULL);
+INSERT INTO borrowers VALUES (1,'V10000008','Tonnesen','Steve',' ','','','asdfasdf',NULL,'asdf','','','',NULL,NULL,NULL,'','0000-00-00','','','2002-06-25',NULL,NULL,NULL,NULL,NULL,'asdf','',NULL,'L','','','M','2003-06-25','','workplace','','',NULL,NULL,'tonnesen','iux7QhPe4Y9aPvjHbrUsCA');
+INSERT INTO borrowers VALUES (2,'V10000019','Doe','Jane','Ms','','','PO Box 333',NULL,'Somewhere, BC','','','',NULL,NULL,NULL,'','0000-00-00','','','2002-06-25',0,0,0,NULL,NULL,'Mr. Buddy Boy','',NULL,'L','','','M','2003-06-25','','workplace','','',NULL,'PO Box 333', 'jdoe', 'iux7QhPe4Y9aPvjHbrUsCA');
+INSERT INTO borrowers VALUES (3,'V1000002X','Smith','John','Mr','','','PO Box 782',NULL,'Somewhere, BC','','','',NULL,NULL,NULL,'','0000-00-00','','','2002-06-25',NULL,NULL,NULL,NULL,NULL,'Mr. Buddy Boy','',NULL,'L','','','M','2003-06-25','','workplace','','',NULL,NULL,'jsmith', 'iux7QhPe4Y9aPvjHbrUsCA');
 
 
 #