diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee
index e2e8311286..249a342668 100644
--- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee
+++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee
@@ -40,6 +40,14 @@ The #{settings.appName} Team - #{settings.siteUrl}
 
 templates = {}
 
+templates.accountMergeToOverleafAddress = CTAEmailTemplate({
+	subject: () -> "Confirm Account Merge - #{settings.appName}"
+	title: () -> "Confirm Account Merge"
+	message: () -> "To merge your ShareLaTeX and Overleaf accounts, click the link below."
+	ctaText: () -> "Confirm Account Merge"
+	ctaURL: (opts) -> opts.tokenLinkUrl
+})
+
 templates.registered = CTAEmailTemplate({
 	subject: () -> "Activate your #{settings.appName} Account"
 	message: (opts) -> """
diff --git a/services/web/public/coffee/main/account-merge-checker.coffee b/services/web/public/coffee/main/account-merge-checker.coffee
index caeb3011ca..98c6b265cd 100644
--- a/services/web/public/coffee/main/account-merge-checker.coffee
+++ b/services/web/public/coffee/main/account-merge-checker.coffee
@@ -1,5 +1,33 @@
 define [
 	"base"
 ], (App) ->
-	App.controller "AccountMergeCheckerController", ($scope) ->
+
+	# For account-merge-module
+	App.controller "SharelatexAccountMergeCheckerController", ($scope, $http) ->
+		$scope.hasOlAccount = null
+		$scope.olEmail = ""
+		$scope.errorCode = null
+		$scope.success = null
+		console.log ">>>> here"
+
+		$scope.submitEmail = () ->
+			return if !$scope.olEmail
+			data = {
+				overleafEmail: $scope.olEmail
+				_csrf: window.csrfToken
+			}
+			console.log ">>>> sending email", data
+			$scope.errorCode = null
+			$http.post("/account-merge/email/overleaf", data)
+				.then (resp) ->
+					console.log ">>>> success", resp
+					$scope.errorCode = null
+					$scope.success = true
+				.catch (resp) ->
+					console.log ">>>> error", resp
+					$scope.errorCode = resp?.data?.errorCode || 'default_error'
+					$scope.success = false
+
+	# For integration-module
+	App.controller "OverleafAccountMergeCheckerController", ($scope) ->
 		$scope.hasOlAccount = null