diff --git a/database/database.go b/database/database.go
index 38f0736..0ed6435 100644
--- a/database/database.go
+++ b/database/database.go
@@ -120,7 +120,7 @@ func MigrateModels() {
 }
 
 // DBAddAdminUser adds a default admin user to the DB
-func DBAddAdminUser(cfg *config.Config) error {
+func DBAddAdminUser(cfg *config.Config) (error, string) {
 	DBpool.AutoMigrate(User{})
 
 	// Check if admin user exists in DB
@@ -157,10 +157,10 @@ func DBAddAdminUser(cfg *config.Config) error {
 		// add admin user to DB
 		err = DBpool.Create(&user).Error
 		if err != nil {
-			return err
+			return err, ""
 		}
 	}
-	return nil
+	return nil, adminPW
 }
 
 func generatePassword(Len int) string {
diff --git a/database/database_test.go b/database/database_test.go
index 9dfcb41..685f318 100644
--- a/database/database_test.go
+++ b/database/database_test.go
@@ -51,39 +51,39 @@ func TestInitDB(t *testing.T) {
 
 	ownconfig := config.NewConfig([]config.Provider{defaults, env})
 
-	err = InitDB(ownconfig)
+	err = InitDB(ownconfig, "true")
 	assert.Error(t, err)
 	dbname, err := configuration.GlobalConfig.String("db.name")
 	assert.NoError(t, err)
 	static["db.name"] = dbname
 	ownconfig = config.NewConfig([]config.Provider{defaults, env})
-	err = InitDB(ownconfig)
+	err = InitDB(ownconfig, "true")
 	assert.Error(t, err)
 
 	dbhost, err := configuration.GlobalConfig.String("db.host")
 	assert.NoError(t, err)
 	static["db.host"] = dbhost
 	ownconfig = config.NewConfig([]config.Provider{defaults, env})
-	err = InitDB(ownconfig)
+	err = InitDB(ownconfig, "true")
 	assert.Error(t, err)
 
 	dbuser, err := configuration.GlobalConfig.String("db.user")
 	static["db.user"] = dbuser
 	ownconfig = config.NewConfig([]config.Provider{defaults, env})
-	err = InitDB(ownconfig)
+	err = InitDB(ownconfig, "true")
 	assert.Error(t, err)
 
 	dbpass, err := configuration.GlobalConfig.String("db.pass")
 	static["db.pass"] = dbpass
 	ownconfig = config.NewConfig([]config.Provider{defaults, env})
-	err = InitDB(ownconfig)
+	err = InitDB(ownconfig, "true")
 	assert.Error(t, err)
 
 	dbssl, err := configuration.GlobalConfig.String("db.ssl")
 	assert.NoError(t, err)
 	static["db.ssl"] = dbssl
 	ownconfig = config.NewConfig([]config.Provider{defaults, env})
-	err = InitDB(ownconfig)
+	err = InitDB(ownconfig, "true")
 	assert.NoError(t, err)
 
 	// Verify that you can connect to the database
diff --git a/routes/component-configuration/config_test.go b/routes/component-configuration/config_test.go
index 6f81cc6..f99252e 100644
--- a/routes/component-configuration/config_test.go
+++ b/routes/component-configuration/config_test.go
@@ -143,7 +143,7 @@ func TestMain(m *testing.M) {
 		panic(m)
 	}
 
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/routes/file/file_test.go b/routes/file/file_test.go
index 8e92534..948ebda 100644
--- a/routes/file/file_test.go
+++ b/routes/file/file_test.go
@@ -81,7 +81,7 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		panic(m)
 	}
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/routes/infrastructure-component/ic_test.go b/routes/infrastructure-component/ic_test.go
index 194ea1e..e6ba12a 100644
--- a/routes/infrastructure-component/ic_test.go
+++ b/routes/infrastructure-component/ic_test.go
@@ -112,7 +112,7 @@ func TestMain(m *testing.M) {
 		panic(m)
 	}
 
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/routes/register_test.go b/routes/register_test.go
index 8103baf..33f8834 100644
--- a/routes/register_test.go
+++ b/routes/register_test.go
@@ -43,7 +43,7 @@ func TestMain(m *testing.M) {
 		panic(m)
 	}
 
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/routes/result/result_test.go b/routes/result/result_test.go
index 521dfd6..9d4aeff 100644
--- a/routes/result/result_test.go
+++ b/routes/result/result_test.go
@@ -98,7 +98,7 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		panic(m)
 	}
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/routes/scenario/scenario_test.go b/routes/scenario/scenario_test.go
index f0d1081..8580e49 100644
--- a/routes/scenario/scenario_test.go
+++ b/routes/scenario/scenario_test.go
@@ -68,7 +68,7 @@ func TestMain(m *testing.M) {
 		panic(m)
 	}
 
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/routes/signal/signal_test.go b/routes/signal/signal_test.go
index b6a072b..0b34d92 100644
--- a/routes/signal/signal_test.go
+++ b/routes/signal/signal_test.go
@@ -151,7 +151,7 @@ func TestMain(m *testing.M) {
 		panic(m)
 	}
 
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/routes/user/user_test.go b/routes/user/user_test.go
index 57d7d36..12db59d 100644
--- a/routes/user/user_test.go
+++ b/routes/user/user_test.go
@@ -55,7 +55,7 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		panic(m)
 	}
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/routes/widget/widget_test.go b/routes/widget/widget_test.go
index ba6aace..e0a987c 100644
--- a/routes/widget/widget_test.go
+++ b/routes/widget/widget_test.go
@@ -120,7 +120,7 @@ func TestMain(m *testing.M) {
 		panic(m)
 	}
 
-	err = database.InitDB(configuration.GlobalConfig)
+	err = database.InitDB(configuration.GlobalConfig, "true")
 	if err != nil {
 		panic(m)
 	}
diff --git a/start.go b/start.go
index 924b938..0e59ffb 100644
--- a/start.go
+++ b/start.go
@@ -127,7 +127,7 @@ func main() {
 	}
 
 	// Make sure that at least one admin user exists in DB
-	err = database.DBAddAdminUser(configuration.GlobalConfig)
+	err, _ = database.DBAddAdminUser(configuration.GlobalConfig)
 	if err != nil {
 		fmt.Println("error: adding admin user failed:", err.Error())
 		log.Fatal(err)