Current user helper refactoring