diff --git a/packages/server/src/routes/index/users.ts b/packages/server/src/routes/index/users.ts
index 5e6b63bf45..428bc698a5 100644
--- a/packages/server/src/routes/index/users.ts
+++ b/packages/server/src/routes/index/users.ts
@@ -166,7 +166,7 @@ router.get('users/:id', async (path: SubPath, ctx: AppContext, user: User = null
 		const lastPaymentAttempt = models.subscription().lastPaymentAttempt(subscription);
 
 		view.content.subscription = subscription;
-		view.content.showCancelSubscription = !isNew;
+		view.content.showManageSubscription = !isNew;
 		view.content.showUpdateSubscriptionBasic = !isNew && !!owner.is_admin && user.account_type !== AccountType.Basic;
 		view.content.showUpdateSubscriptionPro = !isNew && user.account_type !== AccountType.Pro;
 		view.content.subLastPaymentStatus = lastPaymentAttempt.status;
diff --git a/packages/server/src/views/index/help.md b/packages/server/src/views/index/help.md
index 08288bfbcf..1950171636 100644
--- a/packages/server/src/views/index/help.md
+++ b/packages/server/src/views/index/help.md
@@ -6,17 +6,23 @@ Most of your details can be found in your Profile page. To open it, click on the
 
 ## How can I get more space?
 
-If you are on a Basic account, you may upgrade to a Pro account to get more space. Click on the [Profile button](#how-can-i-change-my-details), then scroll down and select "Upgrade account".
+If you are on a Basic account, you may upgrade to a Pro account to get more space. Click on the [Profile button](#how-can-i-change-my-details), then scroll down and select "Upgrade to Pro".
 
 If you are already on a Pro account, and you need more space for specific reasons, please contact us as we may increase the cap in some cases.
 
 ## How can I manage my payment details?
 
-To update your card or other payment details, click on the [Profile button](#how-can-i-change-my-details), then scroll down and click on "Manage payment details".
+To update your card or other payment details, click on the [Profile button](#how-can-i-change-my-details), then scroll down and click on "Manage subscription".
+
+## How can I switch to a different billing cycle or plan?
+
+To switch between yearly and monthly payments, or to change from a Basic to Pro plan or vice versa, please click on the [Profile button](#how-can-i-change-my-details), then scroll down and click on "Manage subscription". From the Subscription page, click on Update Plan to choose your new billing cycle or to change your plan.
+
+Note that if you downgrade from Pro to Basic, new limitations will apply so for example you may have to delete some notes so that your account is below the required limit.
 
 ## How can I cancel my account?
 
-Click on the [Profile button](#how-can-i-change-my-details), then scroll down and click on "Cancel subscription".
+Click on the [Profile button](#how-can-i-change-my-details), then scroll down and click on "Manage subscription".
 
 ## Further information
 
diff --git a/packages/server/src/views/index/user.mustache b/packages/server/src/views/index/user.mustache
index 576218b524..d3435aff24 100644
--- a/packages/server/src/views/index/user.mustache
+++ b/packages/server/src/views/index/user.mustache
@@ -120,25 +120,22 @@
 					{{#showUpdateSubscriptionPro}}
 						<input type="submit" name="update_subscription_pro_button" class="button is-warning" value="Upgrade to Pro" />
 					{{/showUpdateSubscriptionPro}}
-					{{#showCancelSubscription}}
-						<input type="submit" name="cancel_subscription_button" class="button is-danger" value="Cancel subscription" />
-					{{/showCancelSubscription}}
 				</div>
 			{{/global.owner.is_admin}}
 
 			{{^global.owner.is_admin}}
-				<div class="control block">
-					{{#showUpdateSubscriptionPro}}
-						<a href="{{{global.baseUrl}}}/upgrade" class="button is-warning block">Upgrade to Pro</a>
-					{{/showUpdateSubscriptionPro}}
-					{{#showCancelSubscription}}
-						<p class="block"><a href="{{stripePortalUrl}}">Manage payment details</a></p>
-					{{/showCancelSubscription}}
-					{{#showCancelSubscription}}
-						<p id="user_cancel_subscription_link" class="block"><a href="#">Cancel subscription</a></p>
-						<input type="submit" id="user_cancel_subscription_button" name="user_cancel_subscription_button" class="button is-danger" value="Cancel subscription" />
-					{{/showCancelSubscription}}
-				</div>
+				{{#showUpdateSubscriptionPro}}
+					<div class="control block">
+						<p><a href="{{{global.baseUrl}}}/upgrade" class="button is-warning block">Upgrade to Pro</a></p>
+						<p class="help">Click for more info about the Pro plan and to upgrade your account.</p>
+					</div>
+				{{/showUpdateSubscriptionPro}}
+				{{#showManageSubscription}}
+					<div class="control block">
+						<p><a class="button is-link" target="_blank" href="{{stripePortalUrl}}">Manage subscription</a></p>
+						<p class="help">Click to update your payment details, switch to a different billing cycle or plan, or to cancel your subscription.</p>
+					</div>
+				{{/showManageSubscription}}
 			{{/global.owner.is_admin}}
 		</div>
 	{{/subscription}}
@@ -158,15 +155,6 @@
 
 <script>
 	$(() => {
-		if ($('#user_cancel_subscription_link').length) {
-			$('#user_cancel_subscription_button').hide();
-			$('#user_cancel_subscription_link').show();
-			$('#user_cancel_subscription_link').click((event) => {
-				event.preventDefault();
-				$('#user_cancel_subscription_button').click();
-			});
-		}
-
 		document.getElementById("user_form").addEventListener('submit', function(event) {
 			if (event.submitter.getAttribute('name') === 'disable_button') {
 				const ok = confirm('Disable this account?');
@@ -178,21 +166,6 @@
 				if (!ok) event.preventDefault();
 			}
 
-			if (event.submitter.getAttribute('name') === 'cancel_subscription_button') {
-				const ok = confirm('Cancel this subscription?');
-				if (!ok) event.preventDefault();
-			}
-
-			if (event.submitter.getAttribute('name') === 'user_cancel_subscription_button') {
-				const answer = prompt('After cancelling your subscription, your account will be deleted and you will no longer be able to use it for synchronisation. This cannot be undone. If you would like to proceed please type "confirm" in the box below.');
-				if (answer !== 'confirm') {
-					event.preventDefault();
-					alert('The subscription was not cancelled.');
-				} else {
-					alert('Thank you. Your subscription is now going to be cancelled and you will be logged out.');
-				}
-			}
-
 			if (event.submitter.getAttribute('name') === 'update_subscription_basic_button') {
 				const ok = confirm('Downgrade to Basic subscription?');
 				if (!ok) event.preventDefault();