diff --git a/internal/api/nkode_api.go b/internal/api/nkode_api.go
index cf0f581..d604e22 100644
--- a/internal/api/nkode_api.go
+++ b/internal/api/nkode_api.go
@@ -153,14 +153,6 @@ func (n *NKodeAPI) GetLoginInterface(userEmail models.UserEmail, customerId mode
 		log.Printf("user %s for customer %s dne", userEmail, customerId)
 		return nil, config.ErrUserForCustomerDNE
 	}
-	err = user.Interface.PartialInterfaceShuffle()
-	if err != nil {
-		return nil, err
-	}
-	err = n.Db.UpdateUserInterface(user.Id, user.Interface)
-	if err != nil {
-		return nil, err
-	}
 	svgInterface, err := n.Db.GetSvgStringInterface(user.Interface.SvgId)
 	if err != nil {
 		return nil, err
@@ -203,8 +195,13 @@ func (n *NKodeAPI) Login(customerId models.CustomerId, userEmail models.UserEmai
 	if err != nil {
 		return nil, err
 	}
-	err = n.Db.UpdateUserRefreshToken(user.Id, jwtToken.RefreshToken)
-	if err != nil {
+	if err = n.Db.UpdateUserRefreshToken(user.Id, jwtToken.RefreshToken); err != nil {
+		return nil, err
+	}
+	if err = user.Interface.PartialInterfaceShuffle(); err != nil {
+		return nil, err
+	}
+	if err = n.Db.UpdateUserInterface(user.Id, user.Interface); err != nil {
 		return nil, err
 	}
 	return &jwtToken, nil