Some changes for the user popup