Added password controls