diff --git a/web/template/login_form.php b/web/template/login_form.php
index 7fd40fb0..b2ed066f 100644
--- a/web/template/login_form.php
+++ b/web/template/login_form.php
@@ -1,28 +1,23 @@
 <span id="login_bar">
-<?php
-if (isset($_COOKIE["AURSID"])) {
-	print __("Logged-in as: %h%s%h",
-		array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>"));
-}
-else {
-	if ($login_error) {
-		print "<span class='error'>" . $login_error . "</span><br />\n";
-	} ?>
-        <form method='post'>
-         <?php print __("Username:"); ?>
-	<input type='text' name='user' size='30'
-		maxlength="<?php print USERNAME_MAX_LEN; ?>"
-		value='<?php
-			if (isset($_POST['user'])) {
-				print htmlspecialchars($_POST['user'], ENT_QUOTES);
-			 } ?>'>
-         <?php print __("Password:"); ?>
-	<input type='password' name='passwd' size='30'
-		maxlength="<?php print PASSWD_MAX_LEN; ?>">
-	<input type='submit' class='button'
-		 value='<?php  print __("Login"); ?>'>
-</form>
-<?php } ?>
+  <?php
+  if (isset($_COOKIE["AURSID"])) {
+    print __("Logged-in as: %h%s%h", array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>"));
+  }
+  else {
+    if ($login_error) {
+      print "<span class='error'>" . $login_error . "</span><br />\n";
+    } 
+  ?>
+  <form method="post">
+    <label><?php print __("Username:"); ?></label>
+    <input type="text" name="user" size="30" maxlength="<?php print USERNAME_MAX_LEN; ?>" value="<?php
+      if (isset($_POST['user'])) {
+        print htmlspecialchars($_POST['user'], ENT_QUOTES);
+      } ?>" />
+    <label><?php print __("Password:"); ?></label>
+    <input type="password" name="passwd" size="30" maxlength="<?php print PASSWD_MAX_LEN; ?>" />
+    <input type="submit" class="button" value="<?php  print __("Login"); ?>" />
+  </form>
+  <?php } ?>
 </span>
 
-