diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index 7620965500e8..a081de31fb34 100644
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -88,7 +88,14 @@
                 <div id="priceset" class="hiddenElement"></div>
               {/if}
             {/if}
-            {if $member_is_test} {ts}(test){/ts}{/if}<br />
+            {if $member_is_test} {ts}(test){/ts}{/if}
+            <span id="mem-type-override">
+              <a href="#" class="crm-hover-button action-item override-mem-type" id="show-mem-type">
+                {ts}Override organisation and type{/ts}
+              </a>
+              {help id="override_membership_type"}
+            </span>
+            <br />
             <span class="description">{ts}Select Membership Organization and then Membership Type.{/ts}{if $hasPriceSets} {ts}Alternatively, you can use a price set.{/ts}{/if}</span>
           </td>
         </tr>
@@ -126,7 +133,7 @@
           <td id="end-date-readonly">
               {$endDate|crmDate}
               <a href="#" class="crm-hover-button action-item override-date" id="show-end-date">
-                {ts}Over-ride end date{/ts}
+                {ts}Override end date{/ts}
               </a>
               {help id="override_end_date"}
           </td>
@@ -354,6 +361,22 @@
         setDifferentContactBlock();
       });
 
+      // give option to override membership type for auto-renew memberships - dev/core#1331
+      {/literal}
+      {if $isRecur && !$cancelAutoRenew}
+        cj('#mem_type_id select').attr("disabled","disabled");
+      {else}
+        cj('#mem-type-override').hide();
+      {/if}
+      {literal}
+
+      cj('#show-mem-type').click( function( e ) {
+        e.preventDefault();
+        // enable select buttons
+        cj('#mem_type_id select').removeAttr("disabled");
+        cj('#mem-type-override').hide();
+      });
+
       // give option to override end-date for auto-renew memberships
       {/literal}
       {if $isRecur && $endDate}
diff --git a/templates/CRM/Member/Page/Tab.hlp b/templates/CRM/Member/Page/Tab.hlp
index cf5e8bd076b8..32326ec2c6b4 100644
--- a/templates/CRM/Member/Page/Tab.hlp
+++ b/templates/CRM/Member/Page/Tab.hlp
@@ -23,8 +23,15 @@
 {/htxt}
 
 {htxt id="override_end_date-title"}
-  {ts}Override End Date for Auto-renew Memberships{/ts}
+  {ts}Override End Date for Auto-renew Membership{/ts}
 {/htxt}
 {htxt id="override_end_date"}
   <p>{ts}If CiviCRM's membership end-date is different from when the payment processor will next collect a payment, various problems can occur. Members may experience a gap in their membership, and the renewal date may get changed from what is manually entered. Use care when modifying the End Date value, and check the associated recurring payment in your payment processor system so they always match.{/ts}</p>
 {/htxt}
+
+{htxt id="override_membership_type-title"}
+{ts}Override Membership Type for Auto-renew Membership{/ts}
+{/htxt}
+{htxt id="override_membership_type"}
+  <p>{ts}This membership is set to renew automatically. Take care when you change the membership type. Make sure that you also change the related payment at the payment processor. Otherwise future payments may be for the wrong amount.{/ts}</p>
+{/htxt}