A minor upgrade of Current_user model.