diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 60600a252..7dcaa7962 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -140,7 +140,7 @@ class UsersController < ApplicationController
 
       if was_activated
         Mailer.account_activated(@user).deliver
-      elsif @user.active? && params[:send_information] && @user.password.present? && @user.auth_source_id.nil? && @user != User.current
+      elsif @user.active? && params[:send_information] && @user != User.current
         Mailer.account_information(@user, @user.password).deliver
       end
 
diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb
index 4d4066d65..d010431ab 100644
--- a/app/views/mailer/account_information.html.erb
+++ b/app/views/mailer/account_information.html.erb
@@ -4,7 +4,9 @@
 <p><%= l(:mail_body_account_information) %>:</p>
 <ul>
     <li><%= l(:field_login) %>: <%= @user.login %></li>
+    <% if @password %>
     <li><%= l(:field_password) %>: <%= @password %></li>
+    <% end %>
 </ul>
 <% end %>
 
diff --git a/app/views/mailer/account_information.text.erb b/app/views/mailer/account_information.text.erb
index 0a02566d9..f2f37d9c3 100644
--- a/app/views/mailer/account_information.text.erb
+++ b/app/views/mailer/account_information.text.erb
@@ -1,6 +1,6 @@
 <% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %>
 <% else %><%= l(:mail_body_account_information) %>:
 * <%= l(:field_login) %>: <%= @user.login %>
-* <%= l(:field_password) %>: <%= @password %>
+<% if @password %>* <%= l(:field_password) %>: <%= @password %><% end %>
 <% end %>
 <%= l(:label_login) %>: <%= @login_url %>
diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb
index fddea54bb..c9398577c 100644
--- a/app/views/users/_general.html.erb
+++ b/app/views/users/_general.html.erb
@@ -1,7 +1,7 @@
 <%= labelled_form_for @user, :html => {:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <% if @user.active? && email_delivery_enabled? && @user != User.current -%>
-    <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
+    <p><label><%= check_box_tag 'send_information', 1, params[:send_information] %> <%= l(:label_send_information) %></label></p>
   <% end -%>
   <p><%= submit_tag l(:button_save) %></p>
 <% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index e9eb102f8..088f272e4 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -3,7 +3,7 @@
 <%= labelled_form_for @user, :html => {:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <% if email_delivery_enabled? %>
-  <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
+  <p><label><%= check_box_tag 'send_information', 1, params[:send_information] %> <%= l(:label_send_information) %></label></p>
   <% end %>
   <p>
     <%= submit_tag l(:button_create) %>