diff --git a/js/gratipay/routes.js b/js/gratipay/routes.js
index 07ad3d8680..2fd001a3ca 100644
--- a/js/gratipay/routes.js
+++ b/js/gratipay/routes.js
@@ -79,7 +79,6 @@ Gratipay.routes.cc.init = function() {
 
     $('form#credit-card').submit(Gratipay.routes.cc.submit);
     Gratipay.routes.cc.formatInputs(
-        $('#card_number'),
         $('#expiration_month'),
         $('#expiration_year'),
         $('#cvv')
@@ -89,7 +88,7 @@ Gratipay.routes.cc.init = function() {
 
 /* Most of the following code is taken from https://github.com/wangjohn/creditly */
 
-Gratipay.routes.cc.formatInputs = function (cardNumberInput, expirationMonthInput, expirationYearInput, cvvInput) {
+Gratipay.routes.cc.formatInputs = function (expirationMonthInput, expirationYearInput, cvvInput) {
     function getInputValue(e, element) {
         var inputValue = element.val().trim();
         inputValue = inputValue + String.fromCharCode(e.which);
diff --git a/www/~/%username/routes/credit-card.spt b/www/~/%username/routes/credit-card.spt
index dc0ea1bd5a..9d44330008 100644
--- a/www/~/%username/routes/credit-card.spt
+++ b/www/~/%username/routes/credit-card.spt
@@ -38,13 +38,13 @@ else:
     {% endif %}</div>
 
     <div class="long-form">
-        <form id="credit-card" autocomplete="off">
+        <form id="credit-card">
 
             <h2>{{ _("Required") }}</h2>
 
             <label>
                 <span>{{ _("Credit Card Number") }}</span>
-                <input id="card_number" required />
+                <input id="card_number" required autocomplete="cc-number" />
                 <span class="invalid-msg">{{ _("This card number is invalid.") }}</span>
                 {% if card.number %}<span>{{
                     _("Current: {0}", card.number)
@@ -54,22 +54,22 @@ else:
             <div class="half">
                 <label for="expiration_month">{{ _("Expiration") }}</label>
                 <input id="expiration_month" placeholder="{{ _('MM') }}" title="{{ _('Expiration Month') }}"
-                       value="{{ card.expiration_month }}" required />
+                       value="{{ card.expiration_month }}" required autocomplete="cc-exp-month"/>
                 <span class="invalid-msg">{{ _("This expiration date is invalid.") }}</span>
                 <span class="date_slash">/</span>
                 <input id="expiration_year" placeholder="{{ _('YY') }}" title="{{ _('Expiration Year') }}"
-                       value="{{ (card.expiration_year|int) - 2000 if card.expiration_year }}" required />
+                       value="{{ (card.expiration_year|int) - 2000 if card.expiration_year }}" required autocomplete="cc-exp-year" />
             </div>
 
             <label class="half right">
                 <span>{{ _("CVV") }}</span>
-                <input id="cvv" required />
+                <input id="cvv" required autocomplete="cc-csc" />
                 <span class="invalid-msg">{{ _("This verification code is invalid.") }}</span>
             </label>
 
             <label class="half">
                 <span>{{ _("ZIP or Postal Code") }}</span>
-                <input id="zip" value="{{ card.address_postal_code }}" />
+                <input id="zip" value="{{ card.address_postal_code }}" autocomplete="shipping postal-code" />
             </label>
 
             <div class="info">
@@ -82,7 +82,7 @@ else:
 
             <label>
                 <span>{{ _("Full Name on Card") }}</span>
-                <input id="name" value="{{ card.cardholder_name }}" />
+                <input id="name" value="{{ card.cardholder_name }}" autocomplete="cc-name"/>
             </label>
 
             <input type="hidden" id="braintree_token" value="{{ participant.get_braintree_token() }}">