Merge pull request #644 from CanineHQ/two-factor-authentication