diff --git a/application/views/login.php b/application/views/login.php
index 4398fc87f..ed61b4b97 100644
--- a/application/views/login.php
+++ b/application/views/login.php
@@ -9,13 +9,6 @@
 	<!-- start css template tags -->
 	<link rel="stylesheet" type="text/css" href="dist/login.css"/>
 	<!-- end css template tags -->
-
-	<script type="text/javascript">
-		window.onload = function()
-		{
-			document.getElementById("username").focus();
-		};
-	</script>
 </head>
 
 <body>
@@ -27,11 +20,15 @@
 				<div align="center" style="color:red"><?php echo validation_errors(); ?></div>
 				
 				<div id="login_form">
-					<?php echo $this->lang->line('login_username') . ':'; ?>
-					<?php echo form_input(array('name'=>'username', 'id'=>'username', 'class'=>'form-control', 'size'=>'20')); ?>
-
-					<?php echo $this->lang->line('login_password') . ':'; ?>
-					<?php echo form_password(array('name'=>'password', 'id' => 'password', 'class'=>'form-control', 'size'=>'20')); ?>
+					<div class="input-group">
+						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-user"></span></span>
+						<input class="form-control" placeholder="<?php echo $this->lang->line('login_username')?>" name="username" type="username" size=20 autofocus></input>
+					</div>
+					
+					<div class="input-group">
+						<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-lock"></span></span>
+						<input class="form-control" placeholder="<?php echo $this->lang->line('login_password')?>" name="password" type="password" size=20></input>
+					</div>
 					
 					<input class="btn btn-primary btn-block" type="submit" name="loginButton" value="Go"/>
 				</div>
diff --git a/css/login.css b/css/login.css
index e7a56e010..723de4b7f 100644
--- a/css/login.css
+++ b/css/login.css
@@ -36,14 +36,11 @@ form
 	padding:6% 4%;
 }
 
-input[type="text"], input[type="password"]
+input[type="username"], input[type="password"]
 {
 	width:100%;
-	background:#fff;
 	margin-bottom:4%;
-	border:1px solid #ccc;
 	padding:4%;
-	color:#555;
 }
 
 input[type="submit"]
diff --git a/dist/login.css b/dist/login.css
index e7a56e010..723de4b7f 100644
--- a/dist/login.css
+++ b/dist/login.css
@@ -36,14 +36,11 @@ form
 	padding:6% 4%;
 }
 
-input[type="text"], input[type="password"]
+input[type="username"], input[type="password"]
 {
 	width:100%;
-	background:#fff;
 	margin-bottom:4%;
-	border:1px solid #ccc;
 	padding:4%;
-	color:#555;
 }
 
 input[type="submit"]
