diff --git a/lib/server_methods.js b/lib/server_methods.js
index 500440d..1259027 100644
--- a/lib/server_methods.js
+++ b/lib/server_methods.js
@@ -131,12 +131,16 @@ Meteor.methods({
       throw new Meteor.Error(403, "User not found");
     }
 
-    try {
-      Accounts.sendVerificationEmail(user._id);
-    } catch (error) {
-      // Handle error when email already verified
-      // https://github.com/dwinston/send-verification-email-bug
-      throw new Meteor.Error(403, "Already verified");
+    // Throw an error if the requested email is already verified
+    for (var i = 0; i < user.emails.length; i++) {
+      if (user.emails[i].address === email) {
+        if (user.emails[i].verified) {
+          throw new Meteor.Error(403, "Already verified");
+        }
+        break;
+      }
     }
+
+    Accounts.sendVerificationEmail(user._id, email);
   },
 });