Add custom messages to User policy file, fix missing end statement in file