diff --git a/pmaweb/templates/base.html b/pmaweb/templates/base.html
index 7b927122..cf9a4e3f 100644
--- a/pmaweb/templates/base.html
+++ b/pmaweb/templates/base.html
@@ -7,7 +7,7 @@
   <meta name="author" content="phpMyAdmin contributors" />
   <meta name="copyright" content="Copyright &copy; 2003 - {{current_year}} phpMyAdmin contributors" />
   <link rel="copyright" href="{% url 'license' %}" />
-  <title>phpMyAdmin{% if page_title %} -- {{ page_title }}{% endif %}</title>
+  <title>phpMyAdmin{% if page_title %} - {{ page_title }}{% endif %}</title>
   {% if page_rss %}
   <link rel="alternate" type="application/rss+xml" href="{{ page_rss }}" title="{{ page_rss_title }}"/>
   {% endif %}
diff --git a/pmaweb/templates/security/pmasa_detail.html b/pmaweb/templates/security/pmasa_detail.html
index 60687466..4770c96e 100644
--- a/pmaweb/templates/security/pmasa_detail.html
+++ b/pmaweb/templates/security/pmasa_detail.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% load staticfiles %}
 
-<py:def function="page_title">Security - ${announcement_id()}</py:def>
 <py:def function="page_rss">${base_url}security/index.xml</py:def>
 <py:def function="page_rss_title">phpMyAdmin security issues</py:def>
 
diff --git a/security/views.py b/security/views.py
index bb065e74..646c71b1 100644
--- a/security/views.py
+++ b/security/views.py
@@ -26,6 +26,11 @@
 class PMASAView(DetailView):
     model = PMASA
 
+    def get_context_data(self, **kwargs):
+        context = super(PMASAView, self).get_context_data(**kwargs)
+        context['page_title'] = 'Security - {0}'.format(self.object)
+        return context
+
     def get_object(self, queryset=None):
         if queryset is None:
             queryset = self.get_queryset()