diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index 2f717ed18..fba2dca76 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -22,6 +22,8 @@
 
 {% block main_block %}
 
+{% if is_installed %}
+
 <h3>Status</h3>
 
 <br style='clear:both'>
@@ -33,7 +35,7 @@
 <br style='clear:both'>
 
 <p><h3>Hidden Service</h3>
-A hidden service will allow your FreedomBox to provide selected
+A hidden service will allow your {{ cfg.box_name }} to provide selected
 services (such as OwnCloud or Chat) without revealing its location.
 Here is the current configuration:
 <ul>
@@ -52,8 +54,8 @@ Here is the current configuration:
 </p>
 
 <p><h3>Bridge</h3>
-Your FreedomBox is configured as a Tor bridge with obfsproxy, so it
-can help circumvent censorship. If your FreedomBox is behind a router
+Your {{ cfg.box_name }} is configured as a Tor bridge with obfsproxy, so it
+can help circumvent censorship. If your {{ cfg.box_name }} is behind a router
 or firewall, you should make sure the following ports are open, and
 port-forwarded, if necessary:</p>
 
@@ -68,9 +70,18 @@ port-forwarded, if necessary:</p>
 <br style='clear:both'>
 
 <p><h3>SOCKS</h3>
-A Tor SOCKS port is available on your FreedomBox on TCP port
+A Tor SOCKS port is available on your {{ cfg.box_name }} on TCP port
 9050.</p>
 
+{% else %}
+
+  <p>Tor is not installed, please install it. Tor comes pre-installed
+  with {{ cfg.box_name }}. On any Debian-based system (such as
+  {{ cfg.box_name }}) you may install it using the command
+  'aptitude install tor'.</p>
+
+{% endif %}
+
 {% endblock %}
 
 {% block sidebar_right_block %}
@@ -80,11 +91,11 @@ A Tor SOCKS port is available on your FreedomBox on TCP port
     <h3>Tor</h3>
 
     <p>Tor is an anonymous communication system. You can learn more about
-      it from the <a href="https://www.torproject.org/">Tor Project</a>
-      website. For best protection when web surfing, the Tor Project
-      recommends that you use
-      the <a href="https://www.torproject.org/download/download-easy.html.en">Tor
-       Browser Bundle</a>.</p>
+    it from the <a href="https://www.torproject.org/">Tor Project</a>
+    website. For best protection when web surfing, the Tor Project
+    recommends that you use the
+    <a href="https://www.torproject.org/download/download-easy.html.en">
+    Tor Browser</a>.</p>
 
   </div>
 
diff --git a/plinth/modules/tor/tor.py b/plinth/modules/tor/tor.py
index 7d5cc5895..ab48727d3 100644
--- a/plinth/modules/tor/tor.py
+++ b/plinth/modules/tor/tor.py
@@ -61,6 +61,7 @@ def index(request):
 
     return TemplateResponse(request, 'tor.html',
                             {'title': _('Tor Control Panel'),
+                             'is_installed': status['is_installed'],
                              'is_running': status['is_running'],
                              'tor_ports': status['ports'],
                              'tor_hs_enabled': status['hs_enabled'],
@@ -71,6 +72,9 @@ def index(request):
 
 def get_status():
     """Return the current status"""
+    is_installed = actions.superuser_run(
+        'tor',
+        ['get-installed']).strip() == 'installed'
     is_running = actions.superuser_run('tor', ['is-running']).strip() == 'yes'
 
     output = actions.superuser_run('tor-get-ports')
@@ -99,7 +103,8 @@ def get_status():
         hs_hostname = hs_info[0]
         hs_ports = hs_info[1]
 
-    return {'is_running': is_running,
+    return {'is_installed': is_installed,
+            'is_running': is_running,
             'ports': ports,
             'hs_enabled': hs_enabled,
             'hs_hostname': hs_hostname,