Merge "Fix for currently disabled users"