diff --git a/app/views/admin/workgroups/show.html.haml b/app/views/admin/workgroups/show.html.haml
index a5c656f5..11b7cd8b 100644
--- a/app/views/admin/workgroups/show.html.haml
+++ b/app/views/admin/workgroups/show.html.haml
@@ -10,5 +10,5 @@
       |
       = link_to 'Löschen', [:admin, @workgroup], :confirm => 'Bist Du sicher?', :method => :delete
       |
-      = link_to 'Nachricht senden', new_message_path(:message => {:group_id => @ordergroup.id})
+      = link_to 'Nachricht senden', new_message_path(:message => {:group_id => @workgroup.id})
 %p{:style => "clear:both"}= link_to "Gruppenübersicht", admin_workgroups_path
\ No newline at end of file
diff --git a/app/views/foodcoop/workgroups/memberships.html.haml b/app/views/foodcoop/workgroups/memberships.html.haml
deleted file mode 100644
index 66e86694..00000000
--- a/app/views/foodcoop/workgroups/memberships.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render "shared/memberships/members"
\ No newline at end of file
diff --git a/app/views/shared/_user_form_fields.html.haml b/app/views/shared/_user_form_fields.html.haml
index 306b4680..2fb07a75 100644
--- a/app/views/shared/_user_form_fields.html.haml
+++ b/app/views/shared/_user_form_fields.html.haml
@@ -3,7 +3,7 @@
 = f.input :last_name
 = f.input :email
 = f.input :phone
-= f.input :password
+= f.input :password, :required => @user.new_record?
 = f.input :password_confirmation
 - for setting in User::setting_keys.keys
   .input.boolean