Fix fail on user role conflict

The user will already have the desired role if we are just handling
state after an update.

Change-Id: Ib883da36c8b86ae6e5a9cdba140c9a2e32498ab2