-<label for="username"><?=_Email Address?>:</label><input type='text' name="username"/><br />
-<label for="password"><?=_Pass Phrase?>:</label><input type='password' name='password'/><br />
-<input type='submit' name="process" value="<?=_Login?>" /><br /><br />
-<a href='https://blah/index.php?id=4'><?=_Password Login?></a> -<!-- TODO -->
-<a href='https://blah/index.php?id=5'><?=_Lost Password?></a> -
-<a href='https://blah/index.php?id=4&noauto=1'><?=_Net Cafe Login?></a><br />
-<p class='smalltext'><?=s,!"<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount' target='_new'>",!"</a>",If you are having trouble with your username or password, please visit our %swiki page%s for more information?></p>
-</div>
\ No newline at end of file
+<label for="username"><?=_Email Address?>:</label><input class="form-control" type='text' name="username" required/><br />
+<label for="password"><?=_Pass Phrase?>:</label><input class="form-control" type='password' name='password' required/><br />
+<button type='submit' name="process" value="Login" class="btn btn-primary"><?=_Login?></button><br /><br />
+<p class='smalltext'><?=_If you are having trouble with your username or password, please visit our !'<a href="http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount" target="_new">'wiki page!'</a>' for more information?></p>
+</div>