diff --git a/roles/ipsilon/files/templates/index.html b/roles/ipsilon/files/templates/index.html
index d217b7a6c9..8a806143de 100644
--- a/roles/ipsilon/files/templates/index.html
+++ b/roles/ipsilon/files/templates/index.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "master-user.html" %}
 {% block toptext %}
 This is the Federated Open Authentication provider homepage.
 {% endblock %}
diff --git a/roles/ipsilon/files/templates/internalerror.html b/roles/ipsilon/files/templates/internalerror.html
index 055e903062..6979f17969 100644
--- a/roles/ipsilon/files/templates/internalerror.html
+++ b/roles/ipsilon/files/templates/internalerror.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "master-user.html" %}
 {% block toptext %}
 500 - Internal Server Error
 {% endblock %}
diff --git a/roles/ipsilon/files/templates/layout.html b/roles/ipsilon/files/templates/master-user.html
similarity index 100%
rename from roles/ipsilon/files/templates/layout.html
rename to roles/ipsilon/files/templates/master-user.html
diff --git a/roles/ipsilon/files/templates/notfound.html b/roles/ipsilon/files/templates/notfound.html
index 38203cb0ed..b853c95581 100644
--- a/roles/ipsilon/files/templates/notfound.html
+++ b/roles/ipsilon/files/templates/notfound.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "master-user.html" %}
 {% block toptext %}
 404 - Not Found
 {% endblock %}
diff --git a/roles/ipsilon/files/templates/unauthorized.html b/roles/ipsilon/files/templates/unauthorized.html
index 97626914d2..0de3ebfafb 100644
--- a/roles/ipsilon/files/templates/unauthorized.html
+++ b/roles/ipsilon/files/templates/unauthorized.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "master-user.html" %}
 {% block maintitle %}
 401 - Unauthorized
 {% endblock %}