diff --git a/src/main/scala/app/SignInController.scala b/src/main/scala/app/SignInController.scala
index 8a71579..49e6d9b 100644
--- a/src/main/scala/app/SignInController.scala
+++ b/src/main/scala/app/SignInController.scala
@@ -7,10 +7,10 @@
 
 trait SignInControllerBase extends ControllerBase { self: AccountService =>
   
-  case class SignInForm(email: String, password: String)
+  case class SignInForm(userName: String, password: String)
   
   val form = mapping(
-    "email"    -> trim(label("Email",    text(required))), 
+    "userName" -> trim(label("Username", text(required))),
     "password" -> trim(label("Password", text(required)))
   )(SignInForm.apply)
   
@@ -19,7 +19,7 @@
   }
 
   post("/signin", form){ form =>
-    val account = getAccountByUserName(form.email)
+    val account = getAccountByUserName(form.userName)
     if(account.isEmpty || account.get.password != form.password){
       redirect("/signin")
     } else {
diff --git a/src/main/twirl/signin.scala.html b/src/main/twirl/signin.scala.html
index d034ff8..0c3eb68 100644
--- a/src/main/twirl/signin.scala.html
+++ b/src/main/twirl/signin.scala.html
@@ -2,12 +2,12 @@
 @import context._
 @main("Sign in"){
   <form action="@path/signin" method="POST" validate="true">
-    <label for="email">Email</label>
-    <input type="text" name="email" id="email"/>
-    <span id="error-email" class="error-message"></span>
+    <label for="userName">Username</label>
+    <input type="text" name="userName" id="userName"/>
+    <span id="error-userName" class="error"></span>
     <label for="password">Password</label>
     <input type="password" name="password" id="password"/>
-    <span id="error-password" class="error-message"></span>
+    <span id="error-password" class="error"></span>
     <div>
       <input type="submit" class="btn btn-primary" value="Sign in"/>
     </div>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 2622f5b..90173a7 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -37,7 +37,7 @@
   margin-bottom: 40px;
 }
 
-span.error-message {
+span.error {
   color: red;
 }