Further fixes for password