restore editUser error msgs
Merge branch 'osng-486' of https://github.com/osiam/addon-administration into osng-486