Small style fixxes
Don't request the user data again