diff --git a/database/seeds/SettingsSeeder.php b/database/seeds/SettingsSeeder.php
index 55216853..2e3c1f5f 100644
--- a/database/seeds/SettingsSeeder.php
+++ b/database/seeds/SettingsSeeder.php
@@ -3,6 +3,8 @@
 use App\Setting;
 use App\SettingGroup;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class SettingsSeeder extends Seeder
 {
@@ -243,7 +245,15 @@ class SettingsSeeder extends Seeder
             $home_tag->url = '';
             $home_tag->type = 1;
             $home_tag->user_id = 0;
+
             $home_tag->save();
+            $home_tag_id = $home_tag->id;
+
+            if($home_tag_id != 0) {
+                Log::info("Home Tag returned with id $home_tag_id from db! Changing to 0.");
+
+                DB::update('update items set id = 0 where id = ?', [$home_tag_id]);
+            }
 
             $homeapps = \App\Item::withoutGlobalScope('user_id')->doesntHave('parents')->get();
             foreach ($homeapps as $app) {
diff --git a/database/seeds/UsersSeeder.php b/database/seeds/UsersSeeder.php
index 869dbf99..996d7c68 100644
--- a/database/seeds/UsersSeeder.php
+++ b/database/seeds/UsersSeeder.php
@@ -15,11 +15,18 @@ class UsersSeeder extends Seeder
         // Groups
         if (! $user = User::find(1)) {
             $user = new User;
-            $user->id = 1;
             $user->username = 'admin';
             $user->email = 'admin@test.com';
             $user->password = null;
             $user->save();
+
+            $user_id = $user->id;
+
+            if($user_id != 1) {
+                Log::info("First User returned with id $user_id from db! Changing to 1.");
+
+                DB::update('update users set id = 1 where id = ?', [$user_id]);
+            }
         } else {
             //$user->save();
         }