prevent re-assigning method parameter
Merge branch 'osng-480' of github.com:osiam/addon-self-administration into osng-480