4 files changed, 13 insertions, 8 deletions
diff --git a/users/app/views/sessions/_nav.html.haml b/users/app/views/sessions/_nav.html.haml
index b738504..dab865e 100644
--- a/users/app/views/sessions/_nav.html.haml
+++ b/users/app/views/sessions/_nav.html.haml
@@ -1,6 +1,6 @@
 - if logged_in?
   %li
-    = 'logged in as ' + current_user.login
+    = link_to current_user.login, edit_user_path(current_user)
   %li
     = link_to t(:logout), logout_path
   - if admin?
diff --git a/users/app/views/users/_form.html.haml b/users/app/views/users/_form.html.haml
new file mode 100644
index 0000000..8914241
--- /dev/null
+++ b/users/app/views/users/_form.html.haml
@@ -0,0 +1,8 @@
+= simple_form_for @user, :validate => true, :html => {:class => 'form-horizontal'} do |f|
+  %legend
+    = @user.new_record? ? t(:signup_message) : t(:edit_settings)
+  = f.input :login, :input_html => { :id => :srp_username }
+  = f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password }
+  = f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation }
+  = f.button :submit, :class => 'btn-primary' 
+  = link_to t(:cancel), root_url, :class => :btn
diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
new file mode 100644
index 0000000..8298443
--- /dev/null
+++ b/users/app/views/users/edit.html.haml
@@ -0,0 +1,3 @@
+.span8.offset2
+  %h2=t :settings
+  = render 'form'
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
index be14c52..c1c4208 100644
--- a/users/app/views/users/new.html.haml
+++ b/users/app/views/users/new.html.haml
@@ -1,9 +1,3 @@
 .span8.offset2
   %h2=t :signup
-  = simple_form_for @user, :validate => true, :html => {:class => 'form-horizontal'} do |f|
-    %legend=t :signup_message
-    = f.input :login, :input_html => { :id => :srp_username }
-    = f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password }
-    = f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation }
-    = f.button :submit, :value => t(:signup), :class => 'btn-primary' 
-    = link_to t(:cancel), root_url, :class => :btn
+  = render 'form'