diff --git a/lib/gitorious/authentication/crowd/user.rb b/lib/gitorious/authentication/crowd/user.rb
index 4171a2e..bd677a9 100644
--- a/lib/gitorious/authentication/crowd/user.rb
+++ b/lib/gitorious/authentication/crowd/user.rb
@@ -50,6 +50,8 @@ module Gitorious
         user.aasm_state = "terms_accepted"
         user.activated_at = Time.now.utc
         user.save!
+        # Reset the password to something random
+        user.reset_password!
         user
       end
     end
diff --git a/lib/gitorious/authentication/ldap_authentication.rb b/lib/gitorious/authentication/ldap_authentication.rb
index 5a43df7..66cfe38 100644
--- a/lib/gitorious/authentication/ldap_authentication.rb
+++ b/lib/gitorious/authentication/ldap_authentication.rb
@@ -103,6 +103,8 @@ module Gitorious
           user.aasm_state = "terms_accepted"
           user.activated_at = Time.now.utc
           user.save!
+          # Reset the password to something random
+          user.reset_password!
           user
         end
       end