diff --git a/snipts/templates/snipts/list-public.html b/snipts/templates/snipts/list-public.html
index 8088595..2ea99a4 100644
--- a/snipts/templates/snipts/list-public.html
+++ b/snipts/templates/snipts/list-public.html
@@ -21,7 +21,3 @@
{% endif %}
{% endblock %}
-
-{% block aside-top %}
- {% include "snipts/tags-public.html" %}
-{% endblock %}
diff --git a/snipts/templates/snipts/list.html b/snipts/templates/snipts/list.html
index 3e9802e..f2a39be 100644
--- a/snipts/templates/snipts/list.html
+++ b/snipts/templates/snipts/list.html
@@ -26,7 +26,7 @@
{% include "snipts/snipt-list.html" %}
{% empty %}
- {% if request.user == user and not request.user.is_active %}
+ {% if request.user == user and not request.user.is_active and not public %}
Welcome! Please
activate your account to create your first snipt.
{% else %}
{% if request.user == user %}
diff --git a/snipts/templates/snipts/tags-public.html b/snipts/templates/snipts/tags-public.html
deleted file mode 100644
index 92789d6..0000000
--- a/snipts/templates/snipts/tags-public.html
+++ /dev/null
@@ -1,63 +0,0 @@
-
diff --git a/templates/base.html b/templates/base.html
index 7b61345..9970282 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -213,36 +213,16 @@
-
{% endblock %}
@@ -408,11 +388,6 @@
{% endblock %}
-
-
{% block preload %}
diff --git a/templates/tags.html b/templates/tags.html
index d1fd877..10457e8 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -22,7 +22,3 @@
{% paginate %}
{% endblock %}
-
-{% block aside-top %}
- {% include "snipts/tags-public.html" %}
-{% endblock %}