diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index 43540e67c..56b157986 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -20,14 +20,16 @@
 <div class="box">
 <h3><%=l(:label_authentication)%></h3>
 <% unless @auth_sources.empty? %>
-<p><%= f.select :auth_source_id, [[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] } %></p>
+<p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
 <% end %>
+<div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
 <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
 <%= password_field_tag 'password', nil, :size => 25  %><br />
 <em><%= l(:text_length_between, 4, 12) %></em></p>
 <p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
 </div>
+</div>
 <!--[eoform:user]-->
 
 <% content_for :header_tags do %>