Refactored RefreshUserInterceptor (possibly fixes concurrency bug where saving changes sometime fails)