diff --git a/app/templates/base-flat.jade b/app/templates/base-flat.jade
index 19edbc347..67c0a0928 100644
--- a/app/templates/base-flat.jade
+++ b/app/templates/base-flat.jade
@@ -6,7 +6,7 @@ mixin accountLinks
   unless me.isStudent()
     li
       a(href="/account/payments", data-i18n="account.payments")
-  unless me.isTeacher() || me.isStudent()
+  if me.hasSubscription() || !(me.isTeacher() || me.isStudent())
     li
       a(href="/account/subscription", data-i18n="account.subscription")
   unless me.isStudent()
diff --git a/app/templates/base.jade b/app/templates/base.jade
index 9e5dedfc5..7e1397010 100644
--- a/app/templates/base.jade
+++ b/app/templates/base.jade
@@ -35,7 +35,7 @@ block header
               unless me.isStudent()
                 li
                   a(href="/account/payments", data-i18n="account.payments")
-              unless me.isTeacher() || me.isStudent()
+              if me.hasSubscription() || !(me.isTeacher() || me.isStudent())
                 li
                   a(href="/account/subscription", data-i18n="account.subscription")
               unless me.isStudent()