diff --git a/app/controllers/dmsf_folder_permissions_controller.rb b/app/controllers/dmsf_folder_permissions_controller.rb
index f400b2bd..bdb58f67 100644
--- a/app/controllers/dmsf_folder_permissions_controller.rb
+++ b/app/controllers/dmsf_folder_permissions_controller.rb
@@ -36,7 +36,6 @@ class DmsfFolderPermissionsController < ApplicationController
   end
 
   def append
-    #@principals = User.active.visible.where(:id => params[:user_ids]).to_a
     @principals = Principal.where(:id => params[:user_ids]).to_a
     render :nothing => true if @principals.blank?
   end
@@ -51,12 +50,6 @@ class DmsfFolderPermissionsController < ApplicationController
   private
 
   def users_for_new_users
-    #if params[:q].blank? && @project.present?
-    #  scope = @project.users
-    #else
-    #  scope = User.all.limit(100)
-    #end
-    #scope.active.visible.sorted.like(params[:q]).to_a
     Principal.active.visible.member_of(@project).like(params[:q]).order(:type, :lastname).to_a
   end
 
diff --git a/app/helpers/dmsf_folder_permissions_helper.rb b/app/helpers/dmsf_folder_permissions_helper.rb
index c6d3dfdf..8ada6ed6 100644
--- a/app/helpers/dmsf_folder_permissions_helper.rb
+++ b/app/helpers/dmsf_folder_permissions_helper.rb
@@ -7,7 +7,6 @@ module DmsfFolderPermissionsHelper
         content = check_box_tag('permissions[user_ids][]', user.id, true, :id => nil) + user.name
         s << content_tag(:label, content, :id => "user_permission_ids_#{user.id}", :class => 'inline')
       end
-      s << '<br/>' if users.any?
     end
     s.html_safe
   end
diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb
index 95bc1893..23c0b862 100644
--- a/app/views/dmsf/edit.html.erb
+++ b/app/views/dmsf/edit.html.erb
@@ -89,7 +89,12 @@
       <% end %>
       <span id="user_permissions">
         <br/>
-        <%= users_checkboxes(@users) %>
+        <% checkboxes = users_checkboxes(@users) %>
+        <%= checkboxes %>
+      </span>
+        <% if checkboxes.present? %>
+        <br/>
+      <% end %>
       </span>
       <span class="search_for_watchers">
         <%= link_to l(:label_user_search_add),