diff --git a/frappe/core/page/usage_info/usage_info.html b/frappe/core/page/usage_info/usage_info.html
index 5fd564335c..0b85862622 100644
--- a/frappe/core/page/usage_info/usage_info.html
+++ b/frappe/core/page/usage_info/usage_info.html
@@ -1,7 +1,7 @@
 <div>
 	{% if limits.expiry %}
 	<div class="upgrade-message padding" style="border-bottom: 1px solid #d0d8dc;">
-		<h4>{{ __("You have {0} days left in your trial", [days_to_expiry]) }}</h4>
+		<h4>{{ __("You have {0} days left in your subscription", [days_to_expiry]) }}</h4>
 
 		{% if limits.upgrade_url %}
 		<p>Upgrade to a premium plan with more users, storage and priority support.</p>
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index 744a19f770..ed9d767dd1 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -309,24 +309,32 @@ frappe.views.ListSidebar = Class.extend({
 	},
 	setup_upgrade_box: function() {
 		let upgrade_list = $(`<ul class="list-unstyled sidebar-menu"></ul>`).appendTo(this.sidebar);
-		let upgrade_box = $(`<div class="border" style="
-				padding: 0px 10px;
-				border-radius: 3px;
-			">
-			<a><i class="octicon octicon-x pull-right close" style="margin-top: 10px;"></i></a>
-			<h5>Go Premium</h5>
-			<p>Upgrade to a premium plan with more users, storage and priority support.</p>
-			<button class="btn btn-sm btn-default" style="margin-bottom: 10px;">Upgrade</button>
-		</div>`).appendTo(upgrade_list);
-
-		upgrade_box.find('.btn-primary').on('click', () => {
-			window.open(frappe.boot.limits.upgrade_url);
-		});
 
-		upgrade_box.find('.close').on('click', () => {
-			upgrade_list.remove();
-			frappe.flags.upgrade_dismissed = 1;
-		});
+		// Show Renew/Upgrade button,
+		// if account is holding one user free plan or
+		// if account's expiry date within range of 30 days from today's date
+
+		let upgrade_date = frappe.datetime.add_days(get_today(), 30);
+		if (frappe.boot.limits.users === 1 || upgrade_date >= frappe.boot.limits.expiry) {
+			let upgrade_box = $(`<div class="border" style="
+					padding: 0px 10px;
+					border-radius: 3px;
+				">
+				<a><i class="octicon octicon-x pull-right close" style="margin-top: 10px;"></i></a>
+				<h5>Go Premium</h5>
+				<p>Upgrade to a premium plan with more users, storage and priority support.</p>
+				<button class="btn btn-sm btn-primary" style="margin-bottom: 10px;"> Renew / Upgrade </button>
+				</div>`).appendTo(upgrade_list);
+
+			upgrade_box.find('.btn-primary').on('click', () => {
+				frappe.set_route('usage-info');
+			});
+
+			upgrade_box.find('.close').on('click', () => {
+				upgrade_list.remove();
+				frappe.flags.upgrade_dismissed = 1;
+			});
+		}
 	},
 	get_cat_tags:function(){
 		return this.cat_tags;