diff --git a/skylines/config/app_cfg.py b/skylines/config/app_cfg.py
index c995f71505..8600fbf082 100644
--- a/skylines/config/app_cfg.py
+++ b/skylines/config/app_cfg.py
@@ -55,6 +55,7 @@
 # override this if you would like to provide a different who plugin for
 # managing login and logout of your application
 base_config.sa_auth.form_plugin = None
+base_config.sa_auth.translations.user_name = 'email_address'
 
 # override this if you are using a different charset for the login form
 base_config.sa_auth.charset = 'utf-8'
diff --git a/skylines/controllers/root.py b/skylines/controllers/root.py
index 4f9dd3ac37..6f1604ce16 100644
--- a/skylines/controllers/root.py
+++ b/skylines/controllers/root.py
@@ -95,7 +95,7 @@ def post_login(self, came_from = None):
                 came_from = lurl('/')
 
         if not request.identity:
-            flash(_('Sorry, username or password are wrong. Please try again or register.'), 'warning')
+            flash(_('Sorry, email address or password are wrong. Please try again or register.'), 'warning')
         else:
             request.identity['user'].login_ip = request.remote_addr
             request.identity['user'].login_time = datetime.now()
diff --git a/skylines/templates/login.html b/skylines/templates/login.html
index a2d5351303..37bed35f24 100644
--- a/skylines/templates/login.html
+++ b/skylines/templates/login.html
@@ -20,9 +20,9 @@
     <div class="well span8 offset2" id="loginform">
       <form action="${tg.url('/login_handler', params=dict(came_from=came_from.encode('utf-8')))}" method="post" accept-charset="UTF-8" class="loginfields">
         <div class="control-group">
-          <label class="control-label" for="loginusername">Username:</label>
+          <label class="control-label" for="loginusername">Email Address:</label>
           <div class="controls">
-            <input type="text" id="loginusername" name="login" />
+            <input type="text" id="loginusername" name="login" title="Attention! This was changed from username to email address." rel="tooltip"/>
           </div>
         </div>
         <div class="control-group">
diff --git a/skylines/templates/master/topbar.html b/skylines/templates/master/topbar.html
index fee007033f..d1fd93bf42 100644
--- a/skylines/templates/master/topbar.html
+++ b/skylines/templates/master/topbar.html
@@ -32,9 +32,9 @@
             <div class="dropdown-menu">
               <form action="${tg.url('/login_handler', params=dict(came_from=request.url.encode('utf-8')))}" method="post" accept-charset="UTF-8">
                 <div class="control-group">
-                  <label class="control-label" for="username">Username:</label>
+                  <label class="control-label" for="username">Email Address:</label>
                   <div class="controls">
-                    <input type="text" id="username" name="login" />
+                    <input type="text" id="username" name="login" title="Attention! This was changed from username to email address." rel="tooltip"/>
                   </div>
                 </div>
                 <div class="control-group">