diff --git a/trunk/templates/base.tpl b/trunk/templates/base.tpl
index ed3c44f5..0aa89cfe 100644
--- a/trunk/templates/base.tpl
+++ b/trunk/templates/base.tpl
@@ -40,8 +40,8 @@
 				{/foreach}
 			{/if}
 			{/foreach}
+			<dd class='LSform'><input type='submit' value='{$LSform_submittxt}' class='LSform' /></dd>
 		</dl>
-		<input type='submit' value='{$LSform_submittxt}' class='LSform' />
 	</div>
 	<hr class='spacer' />
 </div>
diff --git a/trunk/templates/css/LSform.css b/trunk/templates/css/LSform.css
index 85b87e8e..9f58be38 100644
--- a/trunk/templates/css/LSform.css
+++ b/trunk/templates/css/LSform.css
@@ -18,8 +18,8 @@ dl.LSform {
 }
 
 dd.LSform {
-	margin:											0 0 0 13em;
-	padding:										0 0 0em 0em;
+	margin-left:								13em;
+	padding:										0;
 }
 
 .LSform input, .LSform select, .LSform textarea {
@@ -30,8 +30,8 @@ dd.LSform {
 
 input[type='submit'].LSform {
 	border:											1px outset #ccc;
-	margin-left:								20em;
 	margin-top:									1em;
+	margin-left:								6em;
 	width:											8em;
 }
 
diff --git a/trunk/templates/css/login.css b/trunk/templates/css/login.css
index 9174d9f8..ed29bb19 100644
--- a/trunk/templates/css/login.css
+++ b/trunk/templates/css/login.css
@@ -45,7 +45,6 @@ dl.loginform {
 
 .loginform input[type='submit'] {
 	border:									1px outset #ccc;
-	margin-left:						30em;
-	margin-top:							1em;
-	width:									8em;
+	width:									11em;
+	margin:									1em;
 }
diff --git a/trunk/templates/login.tpl b/trunk/templates/login.tpl
index 0389676a..69df4942 100644
--- a/trunk/templates/login.tpl
+++ b/trunk/templates/login.tpl
@@ -29,8 +29,8 @@
 	<dd><input type='text' name='LSsession_user' /></dd>
 	<dt>{$loginform_label_pwd}</dt>
 	<dd><input type='password' name='LSsession_pwd' /></dd>
+	<dd><input type='submit' value='{$loginform_label_submit}' /></dd>
 </dl>
-<input type='submit' value='{$loginform_label_submit}' />
 </form>
 </div>
 </body>