First commit of 2 to enable choosing the user password hash method