diff --git a/rd_ui/app/login.html b/rd_ui/app/login.html
index 26ca68a5f85..f3b16fe528f 100644
--- a/rd_ui/app/login.html
+++ b/rd_ui/app/login.html
@@ -74,8 +74,8 @@
 
             <form role="form" method="post" name="login">
                 <div class="form-group">
-                    <label for="inputUsernameEmail">Username or email</label>
-                    <input type="text" class="form-control" id="inputUsernameEmail" name="username" value="{{username}}">
+                    <label for="inputEmail">Email</label>
+                    <input type="text" class="form-control" id="inputEmail" name="email" value="{{email}}">
                 </div>
                 <div class="form-group">
                     <!--<a class="pull-right" href="#">Forgot password?</a>-->
diff --git a/redash/controllers.py b/redash/controllers.py
index cfa7bc9b565..a72fba1e38c 100644
--- a/redash/controllers.py
+++ b/redash/controllers.py
@@ -80,15 +80,15 @@ def login():
 
     if request.method == 'POST':
         try:
-            user = models.User.get_by_email(request.form['username'])
+            user = models.User.get_by_email(request.form['email'])
             if user and user.verify_password(request.form['password']):
                 remember = ('remember' in request.form)
                 login_user(user, remember=remember)
                 return redirect(request.args.get('next') or '/')
             else:
-                flash("Wrong username or password.")
+                flash("Wrong email or password.")
         except models.User.DoesNotExist:
-            flash("Wrong username or password.")
+            flash("Wrong email or password.")
 
     return render_template("login.html",
                            name=settings.NAME,