diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index ca3008d1..b990c6df 100644
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -1,6 +1,6 @@
 module shuffle-shared
 
-//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
+replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
 
 go 1.19
 
diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index c9441aaa..ab9f68e5 100755
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -562,7 +562,7 @@ func handleRegister(resp http.ResponseWriter, request *http.Request) {
 
 	currentOrg := user.ActiveOrg
 	if user.ActiveOrg.Id == "" {
-		log.Printf("[WARNING] There's no active org for the user %s. Checking if there's a single one to assing it to.", user.Username)
+		log.Printf("[WARNING] There's no active org for the user %s. Checking if there's a single one to assign it to.", user.Username)
 
 		orgs, err := shuffle.GetAllOrgs(ctx)
 		if err == nil && len(orgs) > 0 {
@@ -620,10 +620,42 @@ func handleRegister(resp http.ResponseWriter, request *http.Request) {
 
 	err = createNewUser(data.Username, data.Password, role, apikey, currentOrg)
 	if err != nil {
-		log.Printf("[WARNING] Failed registering user: %s", err)
-		resp.WriteHeader(401)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, err)))
-		return
+		if strings.Contains(err.Error(), "already exists") {
+			// Assign it to the org
+			log.Printf("[WARNING] User %s already exists. Assigning to org %s", data.Username, currentOrg.Name)
+
+			// Get the user
+			users, err := shuffle.FindUser(ctx, data.Username)
+			if err != nil || len(users) == 0 {
+				log.Printf("[WARNING] Failed finding user %s: %s", data.Username, err)
+				resp.WriteHeader(400)
+				resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, err)))
+				return
+			}
+
+			newUser := users[0]
+
+			if !strings.Contains(newUser.Orgs[0], currentOrg.Id) {
+				newUser.Orgs = append(newUser.Orgs, currentOrg.Id)
+			}
+
+			if newUser.ActiveOrg.Id == "" || newUser.ActiveOrg.Name == "" {
+				newUser.ActiveOrg = currentOrg
+			}
+
+			err = shuffle.SetUser(ctx, &newUser, false)
+			if err != nil {
+				log.Printf("[WARNING] Failed updating the user %s: %s", data.Username, err)
+				resp.WriteHeader(400)
+				resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, err)))
+				return
+			}
+		} else {
+			log.Printf("[WARNING] Failed registering user: %s", err)
+			resp.WriteHeader(401)
+			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, err)))
+			return
+		}
 	}
 
 	resp.WriteHeader(200)
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 3811b0e1..a22bddca 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -932,13 +932,15 @@ func deleteWorkflow(resp http.ResponseWriter, request *http.Request) {
 		}
 	}
 
+	log.Printf("[DEBUG] Attempting to delete the workflow %s from the database...", fileId)
 	err = shuffle.DeleteKey(ctx, "workflow", fileId)
 	if err != nil {
-		log.Printf("[DEBUG]] Failed deleting key %s", fileId)
-		resp.WriteHeader(401)
+		log.Printf("[DEBUG] Failed deleting workflow key %s", fileId)
+		resp.WriteHeader(400)
 		resp.Write([]byte(`{"success": false, "reason": "Failed deleting key"}`))
 		return
 	}
+
 	log.Printf("[INFO] Should have deleted workflow %s (%s)", workflow.Name, fileId)
 
 	cacheKey := fmt.Sprintf("%s_workflows", user.Id)