diff --git a/app/views/user_admin/_form.html.erb b/app/views/user_admin/_form.html.erb
--- a/app/views/user_admin/_form.html.erb
+++ b/app/views/user_admin/_form.html.erb
@@ -14,7 +14,7 @@
<%= password_field 'user', 'password_confirmation' %>
-<%= text_field 'user', 'email' %>
+<%= email_field 'user', 'email' %>
<%= text_field 'user', 'alias' %>
diff --git a/app/views/user_admin/list.html.erb b/app/views/user_admin/list.html.erb
--- a/app/views/user_admin/list.html.erb
+++ b/app/views/user_admin/list.html.erb
@@ -16,7 +16,7 @@
<%= text_field 'user', 'full_name', :size => 30 %> |
<%= password_field 'user', 'password', :size => 10 %> |
<%= password_field 'user', 'password_confirmation', :size => 10 %> |
- <%= text_field 'user', 'email', :size => 15 %> |
+ <%= email_field 'user', 'email', :size => 15 %> |
<%= submit_tag "Create" %> |
diff --git a/app/views/users/forget.html.haml b/app/views/users/forget.html.haml
--- a/app/views/users/forget.html.haml
+++ b/app/views/users/forget.html.haml
@@ -11,7 +11,8 @@
= form_tag :action => 'retrieve_password' do
=t 'registration.password_retrieval.instructions'
- = text_field 'email', nil, :size => 20
+ %br/
+ = email_field 'email', nil, :size => 20
%br/
= submit_tag(t 'registration.password_retrieval.button_label')
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
--- a/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
@@ -25,12 +25,12 @@
%tr
%td{:align => "right"}
= "#{t 'email_label'}:"
- %td= f.text_field :email
+ %td= f.email_field :email
%tr
%td
%td
%small
- =t 'registration.email_guide'
+ =t('registration.email_guide').html_safe
%tr
%td/
%td
diff --git a/config/locales/en.yml b/config/locales/en.yml
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -9,8 +9,8 @@
email_label: 'E-mail'
password_label: 'Password'
- go_ahead_to: "Go ahead to"
- go_back_to: "Go back to"
+ go_ahead_to: "Go ahead to "
+ go_back_to: "Go back to "
login_page: "login page"
home_page: "home page"