Fix for #1366

User API is available everywhere