diff --git a/plinth/modules/help/__init__.py b/plinth/modules/help/__init__.py
index 4addcb579..eed3852df 100644
--- a/plinth/modules/help/__init__.py
+++ b/plinth/modules/help/__init__.py
@@ -5,6 +5,7 @@ FreedomBox app for help pages.
 
 import os
 
+from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from plinth import app as app_module
@@ -32,7 +33,8 @@ class HelpApp(app_module.App):
         menu_item = menu.Menu('menu-help', _('Documentation'), None, 'fa-book',
                               'help:index', parent_url_name='index')
         self.add(menu_item)
-        menu_item = menu.Menu('menu-help-manual', _('Manual'), None,
+        menu_item = menu.Menu('menu-help-manual',
+                              pgettext_lazy('User guide', 'Manual'), None,
                               'fa-info-circle', 'help:manual',
                               parent_url_name='help:index', order=10)
         self.add(menu_item)
diff --git a/plinth/modules/networks/forms.py b/plinth/modules/networks/forms.py
index e3166bc4b..07a11d034 100644
--- a/plinth/modules/networks/forms.py
+++ b/plinth/modules/networks/forms.py
@@ -2,6 +2,7 @@
 
 from django import forms
 from django.core import validators
+from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from plinth import cfg, network
@@ -44,7 +45,8 @@ class ConnectionForm(forms.Form):
               'clients on this network and share its Internet connection.'),
             box_name=_(cfg.box_name)),
         choices=[('auto', _('Automatic (DHCP)')), ('shared', _('Shared')),
-                 ('manual', _('Manual')), ('disabled', _('Disabled'))])
+                 ('manual', pgettext_lazy('Not automatically', 'Manual')),
+                 ('disabled', _('Disabled'))])
     ipv4_address = forms.CharField(
         label=_('Address'), validators=[validators.validate_ipv4_address],
         required=False)
@@ -74,7 +76,8 @@ class ConnectionForm(forms.Form):
               'configuration from this network making it a client.'),
             box_name=_(cfg.box_name)),
         choices=[('auto', _('Automatic')), ('dhcp', _('Automatic, DHCP only')),
-                 ('manual', _('Manual')), ('ignore', _('Ignore'))])
+                 ('manual', pgettext_lazy('Not automatically', 'Manual')),
+                 ('ignore', _('Ignore'))])
     ipv6_address = forms.CharField(
         label=_('Address'), validators=[validators.validate_ipv6_address],
         required=False)
diff --git a/plinth/templates/help-menu.html b/plinth/templates/help-menu.html
index 79a1b2e7d..ab54f353e 100644
--- a/plinth/templates/help-menu.html
+++ b/plinth/templates/help-menu.html
@@ -17,8 +17,8 @@
   <ul class="dropdown-menu" role="menu">
     <li>
       <a href="{% url 'help:manual' %}"
-         title="{% trans "Manual"%}">
-        {% trans "Manual" %}
+         title="{% trans "Manual" context "User guide" %}">
+        {% trans "Manual" context "User guide" %}
       </a>
     </li>
     <li role="separator" class="divider hidden-xs"></li>
diff --git a/plinth/templates/index.html b/plinth/templates/index.html
index 5d6e31819..b353efbfd 100644
--- a/plinth/templates/index.html
+++ b/plinth/templates/index.html
@@ -125,7 +125,7 @@
     <div class="col-md-2 col-md-offset-3">
       <p>
         <a href="https://wiki.debian.org/FreedomBox/Manual">
-          {% trans "Manual" %}
+          {% trans "Manual" context "User guide"%}
         </a>
       </p>
       <p>