changed user handling to accommodate Devise