Fixed problem for user nil case