Set the user e-mail appropriately

api/client.go

@@ -237,10 +237,6 @@ func (cl *Client) Register(preCan bool, registrationCode, nick, email string) (*
 			u.Nick = nick
 		}
 
-		if email != "" {
-			u.Email = email
-		}
-
 		nodekeys, successKeys := user.Users.LookupKeys(u.User)
 
 		if !successKeys {
@@ -403,6 +399,8 @@ func (cl *Client) Register(preCan bool, registrationCode, nick, email string) (*
 		user.Users.UpsertUser(u)
 	}
 
+	u.Email = email
+
 	// Create the user session
 	nus := user.NewSession(cl.storage, u, nk, publicKey, privateKey, cmixGrp, e2eGrp)
 

cmd/root.go

@@ -186,7 +186,7 @@ func sessionInitialization() (*id.User, *api.Client) {
 		// doesn't support non pre canned users
 		uid = id.NewUserFromUints(&[4]uint64{0, 0, 0, userId})
 		// clear userEmail if it was defined, since login was previously done
-		userEmail = ""
+		//userEmail = ""
 		globals.Log.INFO.Printf("Skipped Registration, user: %v", uid)
 	}
 

user/session.go

@@ -237,6 +237,7 @@ func (s *SessionObj) GetCurrentUser() (currentUser *User) {
 		currentUser = &User{
 			User:  s.CurrentUser.User,
 			Nick:  s.CurrentUser.Nick,
+			Email: s.CurrentUser.Email,
 		}
 	}
 	return currentUser