diff --git a/db-connector.go b/db-connector.go
index 2313405..2ae9896 100644
--- a/db-connector.go
+++ b/db-connector.go
@@ -728,7 +728,7 @@ func SetApikey(ctx context.Context, Userdata User) error {
 	// Non indexed User data
 	newapiUser := new(Userapi)
 	newapiUser.ApiKey = Userdata.ApiKey
-	newapiUser.Username = Userdata.Username
+	newapiUser.Username = strings.ToLower(Userdata.Username)
 	key1 := datastore.NameKey("apikey", newapiUser.ApiKey, nil)
 
 	// New struct, to not add body, author etc
@@ -762,10 +762,10 @@ func GetOpenApiDatastore(ctx context.Context, id string) (ParsedOpenApi, error)
 
 // Index = Username
 func SetSession(ctx context.Context, user User, value string) error {
-	parsedKey := strings.ToLower(user.Username)
-	if project.Environment != "cloud" {
-		parsedKey = user.Id
-	}
+	//parsedKey := strings.ToLower(user.Username)
+	//if project.Environment != "cloud" {
+	//}
+	parsedKey := user.Id
 
 	// Non indexed User data
 	user.Session = value
@@ -780,7 +780,8 @@ func SetSession(ctx context.Context, user User, value string) error {
 	if len(user.Session) > 0 {
 		// Indexed session data
 		sessiondata := new(Session)
-		sessiondata.Username = user.Username
+		sessiondata.UserId = strings.ToLower(user.Id)
+		sessiondata.Username = strings.ToLower(user.Username)
 		sessiondata.Session = user.Session
 		sessiondata.Id = user.Id
 		key2 := datastore.NameKey("sessions", sessiondata.Session, nil)
@@ -794,6 +795,20 @@ func SetSession(ctx context.Context, user User, value string) error {
 	return nil
 }
 
+func FindUser(ctx context.Context, username string) ([]User, error) {
+	q := datastore.NewQuery("Users").Filter("Username =", username)
+	var users []User
+	_, err = project.Dbclient.GetAll(ctx, q, &users)
+	if err != nil && len(users) == 0 {
+		log.Printf("[WARNING] Failed getting users for username: %s", username)
+		return users, err
+	}
+
+	log.Printf("[INFO] Found %d user(s) for email %s in db-connector", len(users), username)
+
+	return users, nil
+}
+
 // ListBooks returns a list of books, ordered by title.
 func GetUser(ctx context.Context, username string) (*User, error) {
 	curUser := &User{}
@@ -849,16 +864,16 @@ func GetUser(ctx context.Context, username string) (*User, error) {
 }
 
 func SetUser(ctx context.Context, user *User, updateOrg bool) error {
-	log.Printf("[INFO] Updating a user that has the role %s with %d apps", user.Role, len(user.PrivateApps))
+	log.Printf("[INFO] Updating a user (%s) that has the role %s with %d apps", user.Username, user.Role, len(user.PrivateApps))
+	parsedKey := user.Id
 	if updateOrg {
 		user = fixUserOrg(ctx, user)
 	}
 
 	// clear session_token and API_token for user
-	parsedKey := strings.ToLower(user.Username)
-	if project.Environment != "cloud" {
-		parsedKey = user.Id
-	}
+	//parsedKey := strings.ToLower(user.Username)
+	//if project.Environment != "cloud" {
+	//}
 
 	k := datastore.NameKey("Users", parsedKey, nil)
 	if _, err := project.Dbclient.Put(ctx, k, user); err != nil {
@@ -917,6 +932,7 @@ func fixUserOrg(ctx context.Context, user *User) *User {
 	innerUser.Limits = UserLimits{}
 	innerUser.Authentication = []UserAuth{}
 	innerUser.Password = ""
+	innerUser.Session = ""
 
 	// Might be vulnerable to timing attacks.
 	for _, orgId := range user.Orgs {
diff --git a/shared.go b/shared.go
index 2d31528..fdca24d 100644
--- a/shared.go
+++ b/shared.go
@@ -868,17 +868,9 @@ func HandleApiAuthentication(resp http.ResponseWriter, request *http.Request) (U
 			return User{}, err
 		}
 
-		parsedName := strings.ToLower(session.Username)
-		if project.Environment != "cloud" {
-			parsedName = session.Id
-		}
-
-		//log.Printf("Session: %s", session.Username)
-		// Get session first
-		// Should basically never happen
-		user, err := GetUser(ctx, parsedName)
+		user, err := GetUser(ctx, session.UserId)
 		if err != nil {
-			log.Printf("[INFO] User with Identifier %s doesn't exist: %s", parsedName, err)
+			log.Printf("[INFO] User with Identifier %s doesn't exist: %s", session.UserId, err)
 			return User{}, err
 		}
 
@@ -3345,9 +3337,7 @@ func HandlePasswordChange(resp http.ResponseWriter, request *http.Request) {
 	ctx := getContext(request)
 	foundUser := User{}
 	if !curUserFound {
-		q := datastore.NewQuery("Users").Filter("Username =", strings.ToLower(t.Username))
-		var users []User
-		_, err = project.Dbclient.GetAll(ctx, q, &users)
+		users, err := FindUser(ctx, strings.ToLower(strings.TrimSpace(t.Username)))
 		if err != nil && len(users) == 0 {
 			log.Printf("[WARNING] Failed getting user %s: %s", t.Username, err)
 			resp.WriteHeader(401)
diff --git a/structs.go b/structs.go
index 16ec063..3858a2a 100644
--- a/structs.go
+++ b/structs.go
@@ -267,6 +267,7 @@ type User struct {
 type Session struct {
 	Username string `datastore:"Username,noindex"`
 	Id       string `datastore:"Id,noindex"`
+	UserId   string `datastore:"user_id,noindex"`
 	Session  string `datastore:"session,noindex"`
 }