diff --git a/app/views/order_items/_order_item.html.haml b/app/views/order_items/_order_item.html.haml
index a1c62be..97c01aa 100644
--- a/app/views/order_items/_order_item.html.haml
+++ b/app/views/order_items/_order_item.html.haml
@@ -10,6 +10,5 @@
           = content_tag :span, product.name
           = content_tag :small, euro(product.price)
         = f.counter :count, min: 0, max: product.stock, skip_label: true, wrapper_class: "input-group", class: "row_counter", data: { price: f.object.product.price_cents }
-        = f.input :product_id
-        -# = f.fields_for :product do |product|
-          -# / This is needed for haml
+        = f.fields_for :product do |product|
+          / This is needed for haml
diff --git a/db/migrate/20151028223229_add_default_false_to_admin_users.rb b/db/migrate/20151028223229_add_default_false_to_admin_users.rb
new file mode 100644
index 0000000..27285c1
--- /dev/null
+++ b/db/migrate/20151028223229_add_default_false_to_admin_users.rb
@@ -0,0 +1,5 @@
+class AddDefaultFalseToAdminUsers < ActiveRecord::Migration
+  def change
+    change_column :users, :admin, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a8562ce..3640807 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150919091214) do
+ActiveRecord::Schema.define(version: 20151028223229) do
 
   create_table "barcodes", force: :cascade do |t|
     t.integer  "product_id"
@@ -75,7 +75,7 @@ ActiveRecord::Schema.define(version: 20150919091214) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "remember_created_at"
-    t.boolean  "admin"
+    t.boolean  "admin",               default: false
     t.integer  "dagschotel_id"
     t.string   "avatar_file_name"
     t.string   "avatar_content_type"
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 0225022..11397b8 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -24,8 +24,9 @@ require 'identicon'
 
 FactoryGirl.define do
   factory :user do
-    name   { Faker::Name.name }
-    avatar { Identicon.data_url_for name }
+    name    { Faker::Name.name }
+    avatar  { Identicon.data_url_for name }
+    private { false }
 
     factory :admin do
       admin true
diff --git a/spec/models/product_spec.rb b/spec/models/product_spec.rb
index cfe35f0..abf6e74 100644
--- a/spec/models/product_spec.rb
+++ b/spec/models/product_spec.rb
@@ -127,9 +127,9 @@ describe Product do
     end
   end
 
-  ###########
-  #  SCOPE  #
-  ###########
+  ############
+  #  SCOPES  #
+  ############
 
   describe 'for sale' do
     it 'should return non-deleted products' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 9ed782f..b18e6d1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -45,5 +45,35 @@ describe User do
         expect{ create :order, user: @user }.to change{ @user.reload.orders_count }.by(1)
       end
     end
+
+    describe 'admin' do
+      it 'should be false by default' do
+        expect(@user.reload.admin).to be false
+      end
+    end
+
+    describe 'koelkast' do
+      it 'should be false by default' do
+        expect(@user.reload.koelkast).to be false
+      end
+    end
+  end
+
+  ############
+  #  SCOPES  #
+  ############
+
+  describe 'scopes' do
+    it 'members should return members' do
+      create :koelkast
+      user = create :user
+      expect(User.members).to eq([@user, user])
+    end
+
+    it 'publik should return publik members' do
+      user = create :user
+      create :user, private: true
+      expect(User.publik).to eq([@user, user])
+    end
   end
 end