Fix on Login and Settings map