Reworked PasswordUtil to be sort of singleton
Adjust to new PasswordUtil class
PasswordUtil class adjustments and CS