diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fe0388e..004ed371 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Modified notifiers to use dereferenced services and failures
 - Added core.Example() function for testing
 - Added Custom oAuth Authentication method
+- Fixed setup form not creating user from values inputted in form
 
 # 0.90.55 (06-18-2020)
 - Added 404 page
diff --git a/handlers/oauth.go b/handlers/oauth.go
index 91c241b9..9aa4119b 100644
--- a/handlers/oauth.go
+++ b/handlers/oauth.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/gorilla/mux"
 	"github.com/statping/statping/types/core"
+	"github.com/statping/statping/types/errors"
 	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/types/users"
 	"golang.org/x/oauth2"
@@ -31,6 +32,8 @@ func oauthHandler(w http.ResponseWriter, r *http.Request) {
 		oauth, err = slackOAuth(r)
 	case "custom":
 		oauth, err = customOAuth(r)
+	default:
+		err = errors.New("unknown oauth provider")
 	}
 
 	if err != nil {
diff --git a/handlers/setup.go b/handlers/setup.go
index b4d618d4..565020ed 100644
--- a/handlers/setup.go
+++ b/handlers/setup.go
@@ -31,10 +31,8 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) {
 	project := r.PostForm.Get("project")
 	description := r.PostForm.Get("description")
 	domain := r.PostForm.Get("domain")
-	newsletter := r.PostForm.Get("newsletter")
-	sendNews, _ := strconv.ParseBool(newsletter)
-	reports := r.PostForm.Get("send_reports")
-	sendReports, _ := strconv.ParseBool(reports)
+	sendNews, _ := strconv.ParseBool(r.PostForm.Get("newsletter"))
+	sendReports, _ := strconv.ParseBool(r.PostForm.Get("send_reports"))
 
 	log.WithFields(utils.ToFields(core.App, confgs)).Debugln("new configs posted")
 
diff --git a/types/configs/configs_form.go b/types/configs/configs_form.go
index 6de6c5d7..a2c9da12 100644
--- a/types/configs/configs_form.go
+++ b/types/configs/configs_form.go
@@ -43,6 +43,9 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 	p.Set("DESCRIPTION", description)
 	p.Set("LANGUAGE", language)
 	p.Set("ALLOW_REPORTS", reports)
+	p.Set("ADMIN_USER", username)
+	p.Set("ADMIN_PASSWORD", password)
+	p.Set("ADMIN_EMAIL", email)
 
 	confg := &DbConfig{
 		DbConn:      dbConn,
diff --git a/types/configs/connection.go b/types/configs/connection.go
index c32c4fe2..92b632a5 100644
--- a/types/configs/connection.go
+++ b/types/configs/connection.go
@@ -75,10 +75,9 @@ func initModels(db database.Database) {
 }
 
 func CreateAdminUser(c *DbConfig) error {
-	log.Infoln(fmt.Sprintf("Default Admininstrator user does not exist, creating now! (admin/admin)"))
-
 	adminUser := utils.Params.GetString("ADMIN_USER")
 	adminPass := utils.Params.GetString("ADMIN_PASSWORD")
+	adminEmail := utils.Params.GetString("ADMIN_EMAIL")
 
 	if adminUser == "" || adminPass == "" {
 		adminUser = "admin"
@@ -88,7 +87,7 @@ func CreateAdminUser(c *DbConfig) error {
 	admin := &users.User{
 		Username: adminUser,
 		Password: adminPass,
-		Email:    "info@admin.com",
+		Email:    adminEmail,
 		Admin:    null.NewNullBool(true),
 	}
 
diff --git a/utils/env.go b/utils/env.go
index 10b9ab08..3e54141c 100644
--- a/utils/env.go
+++ b/utils/env.go
@@ -35,6 +35,7 @@ func InitEnvs() {
 	Params.SetDefault("BASE_PATH", "")
 	Params.SetDefault("ADMIN_USER", "admin")
 	Params.SetDefault("ADMIN_PASSWORD", "admin")
+	Params.SetDefault("ADMIN_EMAIL", "info@admin.com")
 	Params.SetDefault("MAX_OPEN_CONN", 25)
 	Params.SetDefault("MAX_IDLE_CONN", 25)
 	Params.SetDefault("MAX_LIFE_CONN", 5*time.Minute)