Fixed merge user screens.