Merge pull request #21 from leapcode/feature/misc_cleanup

Feature/misc cleanup

2 files changed, 3 insertions, 3 deletions

diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
index 03088d8..238c0eb 100644
--- a/users/app/views/users/edit.html.haml
+++ b/users/app/views/users/edit.html.haml
@@ -6,8 +6,8 @@
     = render 'cancel_account' if @user == current_user
   - content_for :email do
     %legend=t :email_address
-    Your email address is
-    = render user.email_address, :as => :span
+    The associated email address is
+    = render @user.email_address, :as => :span
     = user_form_with 'email_forward_field', :legend => :forward_email
     = user_form_with 'email_aliases', :legend => :add_email_alias
   = render 'tabs/tabs', :tabs => [:account, :email]
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index a1eeccb..056ed57 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -3,7 +3,7 @@
   .small
     = link_to 'edit', edit_user_path(@user)
   %dl.offset1
-    - fields = ['login', 'email', 'created_at', 'updated_at', 'email_forward']
+    - fields = ['login', 'email_address', 'created_at', 'updated_at', 'email_forward']
     - fields.each do |field|
       %dt
         = field.titleize