Encryption fix

Validation should all be fine, minus the service bar one which you
stated you were going to make a tooltip, but all the messages do show
up.

For encryption after that form is validated, I think I have it working.
I just don't have the database set up locally here, so it has to be
tested wherever you have the database currently.