diff --git a/app/views/notify/new_user_email.text.erb b/app/views/notify/new_user_email.text.erb
index 794d5a2..94072d7 100644
--- a/app/views/notify/new_user_email.text.erb
+++ b/app/views/notify/new_user_email.text.erb
@@ -3,6 +3,8 @@ Hi <%= @user.name %>!
 Administrator created account for you. Now you are a member of company GitLab application.
           
 login.................. <%= @user.email %>
-password............... <%= @password %>
+<% unless Gitlab.config.gitlab.signup_enabled %>
+  password............... <%= @password %>
+<% end %>
 
 Click here to login: <%= url_for(root_url) %>
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 77d6e9e..22d1ee9 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -55,8 +55,8 @@ describe "Admin::Users" do
         user = User.last
         email = ActionMailer::Base.deliveries.last
         email.subject.should have_content("Account was created")
-        email.body.should have_content(user.email)
-        email.body.should have_content(@password)
+        email.text_part.body.should have_content(user.email)
+        email.text_part.body.should have_content(@password)
       end
     end
 
@@ -67,8 +67,8 @@ describe "Admin::Users" do
         user = User.last
         email = ActionMailer::Base.deliveries.last
         email.subject.should have_content("Account was created")
-        email.body.should have_content(user.email)
-        email.body.should_not have_content(@password)
+        email.text_part.body.should have_content(user.email)
+        email.text_part.body.should_not have_content(@password)
       end
     end
   end
--
libgit2 0.21.2