Merge "Fixes NPE on user changing back to Owner"