Fix secure password input
Fix megre conflict