Fix User constant missing on second request