diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2741498..474839f 100755
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -12,6 +12,17 @@ class UsersController < ApplicationController
     end
     redirect_to users_url
   end
+  
+  def all_update
+    
+    params[:users].each do |id,u| 
+      user=User.find(id) 
+      user.fetprofile = Fetprofile.find(u[:fetprofile_id].to_i) if u[:fetprofile_id].to_i>0 
+      user.save if can? :edit, User
+    end
+    redirect_to users_url
+  end
+
   def do_confirm
     @user= User.find(params[:id])
     @user.confirm!
diff --git a/app/models/fetprofile.rb b/app/models/fetprofile.rb
index bd810ee..7c23182 100644
--- a/app/models/fetprofile.rb
+++ b/app/models/fetprofile.rb
@@ -23,9 +23,9 @@ class Fetprofile < ActiveRecord::Base
 validates :desc, :presence=>true
   validates :nachname, length:{minimum: 3},:presence=>true
   validates :vorname, length:{minimum: 3},:presence=>true
- 
+  has_many :users
 
- accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:gremium_id].blank?}
+ accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:gremium_id].blank?}, :allow_destroy=>true
  
   def name
     [vorname, nachname, ((short.empty?)? "": ["(",short,")"].join)].join(" ")
diff --git a/app/models/user.rb b/app/models/user.rb
index d764a1d..a18646b 100755
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -33,6 +33,7 @@ class User < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me, :provider, :uid, :name
+belongs_to :fetprofile
   # attr_accessible :title, :body
   def self.find_for_facebook_oauth(auth, signed_in_resource=nil)
 logger.debug auth.to_s
@@ -79,5 +80,11 @@ logger.debug auth.to_s
      end
     end
   end
-  
+ def text
+   if self.fetprofile.nil? 
+     self.email
+else
+self.fetprofile.name
+end
+end
 end
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index 36de7a7..aae1ba9 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -6,7 +6,7 @@
 </span>
 <span class="pull-right">
   <%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> 
-  <%= "am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil?  %>
+  <%= @neuigkeit.author.text+ " am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil?  %>
 </span>
 <div class="media">
   <div class="pull-left" href="#">
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 5e21ced..30fc2c1 100755
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -3,31 +3,45 @@
 <%= link_to "Admin" , :controller =>"config" , :action => "index"%>
 </li>
 </ul>
+
+<%= semantic_form_for "users[]", :url=>all_update_users_path do |ff|%>
 <table class="table table-striped">
 
-<tr><th>E-Mail</th><th>Rollen</th><th>Actions</th>
-</tr>
-<% @users.each do |user|%>
-<tr>
-<td>
-	<%= user.email %></td><td><ul>
-	<% user.roles.each do |role| %>
-	<li><%= role.name%></li>
-<% end %></ul></td>
-<td>
+  <tr><th>E-Mail</th><th>Rollen</th><th>Actions</th><th>Profile</th>
+  </tr>
+  <% @users.each do |user|%>
 
-<div class="btn-group">
-    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-    Action
-    <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu">
-		<li><%= link_to 'Rolle: fetadmin', user_add_role_path(user, "fetadmin")%></li>
-		<li><%= link_to 'Rolle: fetuser', user_add_role_path(user, "fetuser")%></li>
-	
-    <!-- dropdown menu links -->
-    </ul>
-</div>
-</td>
-</tr><% end %>
+  <tr>
+    <td><%= user.email %></td>
+    <td>
+      <ul>
+	<% user.roles.each do |role| %><li><%= role.name%></li><% end %>
+      </ul>
+    </td>
+    <td>
+      <div class="btn-group">
+	<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+	  Action
+	  <span class="caret"></span>
+	</a>
+	<ul class="dropdown-menu">
+	  <li><%= link_to 'Rolle: fetadmin', user_add_role_path(user, "fetadmin")%></li>
+	  <li><%= link_to 'Rolle: fetuser', user_add_role_path(user, "fetuser")%></li>
+	  <!-- dropdown menu links -->
+	</ul>
+      </div>
+    </td>
+    <td>
+      <%= semantic_fields_for "users[#{user.id}]", user do |f|%>
+      <%= f.input :fetprofile ,:label=>false , :as=>:select , :collection=>Fetprofile.all %>
+
+      <% end %>
+    </td>
+  </tr>
+  <% end %>
 </table>
+<%= ff.actions do %>
+      <%= ff.action :submit, :as => :button %>
+      <%= ff.action :cancel, :as => :link %>
+      <% end %>
+<% end %>