diff --git a/lib/at_pwd_form.js b/lib/at_pwd_form.js
index 91f08d7..d01c6ff 100644
--- a/lib/at_pwd_form.js
+++ b/lib/at_pwd_form.js
@@ -2,4 +2,11 @@
 Template.atPwdForm.helpers(AccountsTemplates.atPwdFormHelpers);
 
 // Simply 'inherites' events from AccountsTemplates
-Template.atPwdForm.events(AccountsTemplates.atPwdFormEvents);
\ No newline at end of file
+Template.atPwdForm.events(AccountsTemplates.atPwdFormEvents);
+
+// Use the polymer button to submit the form, it can't trigger submit events
+pwdFormSubmit = AccountsTemplates.atPwdFormEvents["submit #at-pwd-form"]
+
+Template.atPwdForm.events({
+  "click .at-btn.submit": pwdFormSubmit,
+});
diff --git a/lib/at_pwd_form_btn.html b/lib/at_pwd_form_btn.html
index f0a8ed4..0d2c45a 100644
--- a/lib/at_pwd_form_btn.html
+++ b/lib/at_pwd_form_btn.html
@@ -1,6 +1,5 @@
 <template name="atPwdFormBtn">
   <div class="horizontal layout center-justified">
-  	<button type="submit" id="at-btn" hidden></button>
     <paper-button class="at-btn submit {{submitDisabled}}" role="button" id="at-btn-polymer" raised>
       {{buttonText}}
     </paper-button>
diff --git a/lib/at_pwd_form_btn.js b/lib/at_pwd_form_btn.js
index 88ccb21..498ffaf 100644
--- a/lib/at_pwd_form_btn.js
+++ b/lib/at_pwd_form_btn.js
@@ -1,10 +1,2 @@
 // Simply 'inherites' helpers from AccountsTemplates
 Template.atPwdFormBtn.helpers(AccountsTemplates.atPwdFormBtnHelpers);
-
-
-Template.atPwdFormBtn.events = {
-	'click #at-btn-polymer': function(event,template) {
-		event.preventDefault();
-		template.find('button[type=submit]').click();
-	}
-};