diff -r adc8466df404 -r 753f1380d6bc app/controllers/.svn/text-base/roles_controller.rb.svn-base
--- a/app/controllers/.svn/text-base/roles_controller.rb.svn-base
+++ b/app/controllers/.svn/text-base/roles_controller.rb.svn-base
@@ -38,9 +38,10 @@
       end
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'index'
+    else
+      @permissions = @role.setable_permissions
+      @roles = Role.find :all, :order => 'builtin, position'
     end
-    @permissions = @role.setable_permissions
-    @roles = Role.find :all, :order => 'builtin, position'
   end
 
   def edit
@@ -48,8 +49,9 @@
     if request.post? and @role.update_attributes(params[:role])
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'index'
+    else
+      @permissions = @role.setable_permissions  
     end
-    @permissions = @role.setable_permissions
   end
 
   def destroy