Updated to work with OCOR Devise authentication