Refactored code, also fixed issue when user was able to remove edited user-role.