diff --git a/templates/app/server/api/user(auth)/user.model(mongooseModels).js b/templates/app/server/api/user(auth)/user.model(mongooseModels).js
index 5394bad3c..d11f5d4d1 100644
--- a/templates/app/server/api/user(auth)/user.model(mongooseModels).js
+++ b/templates/app/server/api/user(auth)/user.model(mongooseModels).js
@@ -95,10 +95,6 @@ UserSchema
   .path('email')
   .validate(function(value, respond) {
     var self = this;
-    <%_ if(filters.oauth) { _%>
-    if (authTypes.indexOf(this.provider) !== -1) {
-      return respond(true);
-    }<% } %>
     return this.constructor.findOne({ email: value }).exec()
       .then(function(user) {
         if (user) {
diff --git a/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js b/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js
index 16c34339c..6bb678064 100644
--- a/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js
+++ b/templates/app/server/auth(auth)/twitter(twitterAuth)/passport.js
@@ -8,6 +8,9 @@ export function setup(User, config) {
     callbackURL: config.twitter.callbackURL
   },
   function(token, tokenSecret, profile, done) {
+    if(!isNAN(profile._json.id)){
+      profile._json.id = profile._json.id.toString();
+    }
     <% if (filters.mongooseModels) { %>User.findOne({'twitter.id': profile.id}).exec()<% }
        if (filters.sequelizeModels) { %>User.find({where:{'twitter.id': profile.id}})<% } %>
       .then(user => {