diff --git a/server/lib/accounts.coffee b/server/lib/accounts.coffee
index 3814bac82ed..ef67195990d 100644
--- a/server/lib/accounts.coffee
+++ b/server/lib/accounts.coffee
@@ -1,5 +1,9 @@
 Accounts.emailTemplates.siteName = "ROCKET.CHAT";
 Accounts.emailTemplates.from = "ROCKET.CHAT <no-reply@rocket.chat>";
+verifyEmailText = Accounts.emailTemplates.verifyEmail.text
+Accounts.emailTemplates.verifyEmail.text = (user, url) ->
+	url = url.replace Meteor.absoluteUrl(), Meteor.absoluteUrl() + 'login/'
+	verifyEmailText user, url
 
 Accounts.onCreateUser (options, user) ->
 	# console.log 'options ->',JSON.stringify options, null, '  '
diff --git a/server/methods/sendConfirmationEmail.coffee b/server/methods/sendConfirmationEmail.coffee
index cf8c1fb85c5..1b3f4977852 100644
--- a/server/methods/sendConfirmationEmail.coffee
+++ b/server/methods/sendConfirmationEmail.coffee
@@ -1,6 +1,6 @@
 Meteor.methods
 	sendConfirmationEmail: (email) ->
-		user = Meteor.users.findOne {'email.address': email}
+		user = Meteor.users.findOne {'emails.address': email}
 
 		if user?
 			Accounts.sendVerificationEmail(user._id, email)