Merge "Minor improvements on user management stack."