CurrentUser should always return the flag if set

previously when the user flag was provided, the function would still try
to get a user from config. flag should take precedence