diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 85c180142..71bd12f46 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -11,8 +11,8 @@
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
 			<div class="main">
 				<div class="control-group clear">
-					<%= f.label :user_id ,t(:user_id)%>
-					<%= f.text_field :user_id, :placeholder => t(:email), :style => "width: 330px;" %>
+					<%= f.label :user_id ,t("users.user_id")%>
+					<%= f.text_field :user_id, :placeholder => t("users.user_id"), :style => "width: 330px;" %>
 					<span class="help-inline">Please correct the error</span>
 				</div>
 				<div class="control-group clear">
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index a814d6989..52deb8e7e 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -74,7 +74,7 @@
               <li>
               <div class="input-prepend">
                 <span class="add-on"><i class="icon-user"></i></span>
-                <%= f.text_field :user_id, :class => 'span2', :placeholder => t(:email), :size => 16 %>
+                <%= f.text_field :user_id, :class => 'span2', :placeholder => t("users.user_id"), :size => 16 %>
               </div>
               </li>
               <li>
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index cf578eac1..08d1aeb24 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -13,7 +13,7 @@ en:
       ldap_connection_failed: 'LDAP connection failed'
       ldap_pass_but_account_not_in_orbit: 'LDAP account is not supported to sign up this site.'
       locked: 'Your account is locked.'
-      invalid: 'Invalid email or password.'
+      invalid: 'Invalid user account or password.'
       invalid_token: 'Invalid authentication token.'
       timeout: 'Your session expired, please sign in again to continue.'
       inactive: 'Your account was not activated yet.'
diff --git a/config/locales/devise.zh_tw.yml b/config/locales/devise.zh_tw.yml
index 0f2a5ad01..e70db8b2d 100644
--- a/config/locales/devise.zh_tw.yml
+++ b/config/locales/devise.zh_tw.yml
@@ -6,7 +6,7 @@ zh_tw:
     failure:
       already_authenticated: 你已經登入。
       inactive: 您的帳號尚未被啟用。
-      invalid: Email 或密碼是無效的。
+      invalid: 帳號或密碼是無效的。
       invalid_token: 無效的認證代碼。
       locked: 您的帳號已被鎖定。
       timeout: 您的登入時效過期，請重新登入，才能繼續。
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 88799bc97..86adc89d4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -428,7 +428,7 @@ en:
     module_page_lang_not_support: "We are sorry, this page is not available for English"
     not_previewable: "Preview not support"
     preview_only_for_img: "Preview only supprt with file type: jpg, png, gif, bmp"
-  sys_basic_form: System Default Basic Field
+  sys_basic_form: System Required Info.
   sys_basic_id_form: System Account Info.
   system_info: System information
   tag_cloud: Tag cloud