diff --git a/app/logical/user_promotion.rb b/app/logical/user_promotion.rb
index 69e2a8edb..981c9e2fd 100644
--- a/app/logical/user_promotion.rb
+++ b/app/logical/user_promotion.rb
@@ -15,8 +15,15 @@ class UserPromotion
     @old_can_upload_free = user.can_upload_free?
 
     user.level = new_level
-    user.can_approve_posts = options[:can_approve_posts]
-    user.can_upload_free = options[:can_upload_free]
+
+    if options.has_key?(:can_approve_posts)
+      user.can_approve_posts = options[:can_approve_posts]
+    end
+
+    if options.has_key?(:can_upload_free)
+      user.can_upload_free = options[:can_upload_free]
+    end
+    
     user.inviter_id = promoter.id
 
     create_user_feedback unless options[:skip_feedback]
diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb
index b3a08bb36..c8c950a6b 100644
--- a/app/views/admin/users/edit.html.erb
+++ b/app/views/admin/users/edit.html.erb
@@ -10,14 +10,14 @@
         <%= user_level_select(:user, :level) %>
       </div>
 
-      <div class="input boolean optional">
+      <div class="input">
         <label for="user_can_upload_free" class="optional">Unrestricted Uploads</label>
-        <%= check_box(:user, :can_upload_free) %>
+        <%= select(:user, :can_upload_free, [["Yes", true], ["No", false]]) %>
       </div>
 
-      <div class="input boolean optional">
+      <div class="input">
         <label for="user_can_approve_posts" class="optional">Approve Posts</label>
-        <%= check_box(:user, :can_approve_posts) %>
+        <%= select(:user, :can_approve_posts, [["Yes", true], ["No", false]]) %>
       </div>
 
       <%= submit_tag "Update" %>