Fix password and UI