Current user nil fix