Some code cleanup and fix a bug where password gets stored using Settings.setPassword() before the password && confirmation entries match