X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/63451844f6796a4aa14ac4341d7dfbce3e9d7903..66b92c6eb5fadc62c503a6925b86eff03632d640:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index ca79d3b7e..ce89112de 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -693,6 +693,7 @@ sub cgi_signin ($$) { #{{{
 		javascript => 0,
 		params => $q,
 		action => $q->request_uri,
+		template => (-e "$templatedir/signin.tmpl" ? "$templatedir/signin.tmpl" : "")
 	);
 	
 	$form->sessionid($session->id);
@@ -745,13 +746,14 @@ sub cgi_signin ($$) { #{{{
 	if ($form->submitted && $form->validate) {
 		if ($form->submitted eq 'Login') {
 			$session->param("name", $form->field("name"));
-			if (defined $form->field("do")) {
-				$q->redirect(
+			if (defined $form->field("do") && 
+			    $form->field("do") ne 'signin') {
+				print $q->redirect(
 					"$cgiurl?do=".$form->field("do").
 					"&page=".$form->field("page"));
 			}
 			else {
-				$q->redirect($url);
+				print $q->redirect($url);
 			}
 		}
 		elsif ($form->submitted eq 'Register') {