diff --git a/app/models/user.rb b/app/models/user.rb
index 77a38301..9ebea407 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -50,6 +50,7 @@ class User < ActiveRecord::Base
 
   def setup_role
     self.is_admin = true if User.count == 0
+    roles << Role.where(name: 'Admin') if User.count == 1
   end
 
   # Gets the roles of the user, groups them by role.name and returns the resource(s) of each role
diff --git a/db/migrate/20140801080705_add_users_to_events.rb b/db/migrate/20140801080705_add_users_to_events.rb
index 4334a76f..b57c0740 100644
--- a/db/migrate/20140801080705_add_users_to_events.rb
+++ b/db/migrate/20140801080705_add_users_to_events.rb
@@ -15,15 +15,8 @@ class AddUsersToEvents < ActiveRecord::Migration
   def up
     TempEvent.all.each do |event|
       if TempEventUser.where(event_id: event).blank?
-        # Create dummy user
-        unless (user = User.find_by(email: 'deleted@localhost.osem'))
-          user = User.new(email: 'deleted@localhost.osem', name: 'User deleted',
-                          biography: 'Data is no longer available for deleted user.',
-                          password: Devise.friendly_token[0, 20])
-          user.skip_confirmation!
-          user.save!
-        end
-
+        # Assign sample user (created in seeds)
+        user = User.find_by(email: 'deleted@localhost.osem')
         TempEventUser.create!(event_id: event.id, user_id: user.id, event_role: 'submitter')
         TempEventUser.create!(event_id: event.id, user_id: user.id, event_role: 'speaker')
       end
diff --git a/db/seeds.rb b/db/seeds.rb
index 91f036d6..6025b3bc 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,10 +6,17 @@
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
 
+# Create sample user
+user = User.new(email: 'deleted@localhost.osem', name: 'User deleted',
+biography: 'Data is no longer available for deleted user.',
+password: Devise.friendly_token[0, 20])
+user.skip_confirmation!
+user.save!
+
 # Questions
-qtype_yesno = QuestionType.create(title: 'Yes/No')
-QuestionType.create(title: 'Single Choice')
-QuestionType.create(title: 'Multiple Choice')
+qtype_yesno = QuestionType.create(title: "Yes/No")
+QuestionType.create(title: "Single Choice")
+QuestionType.create(title: "Multiple Choice")
 
 answer_yes = Answer.create(title: 'Yes')
 answer_no = Answer.create(title: 'No')