Added salt validations, updated roles