Fixes #6953 - Fixing N_ calls in User