diff --git a/app/models/user.rb b/app/models/user.rb
index 21ccc76978e..08ad619a90c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -45,6 +45,7 @@
 #  last_credential_check_at :datetime
 #  github_access_token      :string(255)
 #  notification_email       :string(255)
+#  password_automatically_set :boolean        default(FALSE)
 #
 
 require 'carrierwave/orm/activerecord'
@@ -350,6 +351,10 @@ class User < ActiveRecord::Base
     keys.count == 0
   end
 
+  def require_password?
+    password_automatically_set? && !ldap_user?
+  end
+
   def can_change_username?
     gitlab_config.username_changing_enabled
   end
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index df0bde76980..a1121750ca3 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -9,7 +9,7 @@
       :"data-container" => "body"}
       SSH
     %button{ |
-      class: "btn #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.password_automatically_set? }", |
+      class: "btn #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }", |
       :"data-clone" => project.http_url_to_repo, |
       :"data-title" => "Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}",
       :"data-html" => "true",
diff --git a/app/views/shared/_no_password.html.haml b/app/views/shared/_no_password.html.haml
index 022097cda16..a43bf33751a 100644
--- a/app/views/shared/_no_password.html.haml
+++ b/app/views/shared/_no_password.html.haml
@@ -1,4 +1,4 @@
-- if cookies[:hide_no_password_message].blank? && !current_user.hide_no_password && current_user.password_automatically_set?
+- if cookies[:hide_no_password_message].blank? && !current_user.hide_no_password && current_user.require_password?
   .no-password-message.alert.alert-warning.hidden-xs
     You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account