Small change to UserHandler