Fixing help current_user = null issue