Fixes NPE on user changing back to Owner

Change-Id: I776dc713f2616ee0e57a0d8be1b7aab50d3fc453
Fixes: 116298366
Test: Manual and runtest
1 file changed