Put underscore back in, removed operator spaces, base64 encode user-given salt to make it all consistant