diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 98c53df..0a1b2db 100755
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,7 +3,11 @@ class UsersController < ApplicationController
     @users = User.all
     end
     def add_role
-    @user.find(params[:id])
+    @user= User.find(params[:id])
     @user.add_role(params[:role])
     end
+    def do_confirm
+    @user= User.find(params[:id])
+    @user.confirm!
+    end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 51a0d5d..e33fa36 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -27,13 +27,23 @@ class Ability
     
     # For Debug allow everything
     # Remove this line in production environment and for testing user management
-    can :manage, :all     
-    
+    # can :manage, :all     
+    can [:show, :index], :all
     # Rechteverwaltung f�r Studien Modul
     can :read, Modulgruppe
     can :manage, Modulgruppe
-
-
+    
+    # Rechteverwaltung Kalender 
+    can [:show, :index], Calendar 
+    can [:show], Calentry
+    if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
+    can  [:edit, :update,:new,:create,:verwalten], Calendar
+    can  [:edit, :update,:new,:create,:verwalten], Calentry
+    end
+	if( user.has_role?("fetadmin"))
+	can [:delete],Calendar
+	can [:delete],Calentry
+	end
  
     # Rechteverwaltung fuer Neuigkeiten
 
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index f630561..efd4a23 100755
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -5,12 +5,17 @@
 </ul>
 <table class="table table-striped">
 <% @users.each do |user|%>
-<tr><th>Name</th><th>E-Mail</th><th>Rollen</th>
-</tr><tr><td></td>
+<tr><th>E-Mail</th><th>Rollen</th><th>Actions</th>
+</tr><tr>
 <td>
 	<%= user.email %></td><td><ul>
 	<% user.roles.each do |role| %>
 	<li><%= role.name%></li>
-<% end %></ul></td><td><%= link_to 'MK FETUSER', user_add_role_path(user, "fetadmin")%></td>
+<% end %></ul></td>
+<td>
+<%= link_to 'MK fetadmin', user_add_role_path(user, "fetadmin")%>
+<%= link_to 'MK fetuser', user_add_role_path(user, "fetuser")%>
+<%= link_to 'doconfirm', user_do_confirm_path(user)%>
+</td>
 </tr><% end %>
 </table>