diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 13cf8b20f..8c5d4acea 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2023,7 +2023,7 @@ module ApplicationHelper
       candown = User.current.member_of?(project) || (project.is_public && attachment_history.is_public == 1)
     elsif attachment_history.container_type == "OrgSubfield"
       org = OrgSubfield.find(attachment_history.container_id)
-      candown = User.current.member_of_org?(org) || (org.organization.is_public && attachment_history.is_public == 1)
+      candown = User.current.member_of_org?(org) || (org.organization.is_public && attachment_history.is_public == 1 && (User.current.logged? || org.organization.allow_guest_download?))
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index a74c20751..2c7d61b5c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -822,6 +822,9 @@ class User < Principal
   end
 
   def member_of_org?(org)
+    if !self.logged?
+      return false
+    end
     OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count > 0
   end
 
diff --git a/db/migrate/20160309022930_set_priority_for_org_subfields.rb b/db/migrate/20160309022930_set_priority_for_org_subfields.rb
index f82400a62..56bafd071 100644
--- a/db/migrate/20160309022930_set_priority_for_org_subfields.rb
+++ b/db/migrate/20160309022930_set_priority_for_org_subfields.rb
@@ -3,7 +3,7 @@ class SetPriorityForOrgSubfields < ActiveRecord::Migration
     Organization.all.each do |org|
       org.transaction do
         org.org_subfields.where("field_type='default'").each do|field|
-          case field.field_type
+          case field.name
             when 'activity'
               field.update_attribute(:priority, 1)
             when 'course'