diff --git a/app/blueprints/todo/__init__.py b/app/blueprints/todo/__init__.py
index 459fc8c5..58ccb24a 100644
--- a/app/blueprints/todo/__init__.py
+++ b/app/blueprints/todo/__init__.py
@@ -17,6 +17,7 @@
 from flask import *
 from flask_login import current_user, login_required
 from sqlalchemy import or_
+from sqlalchemy.sql.operators import is_
 
 from app.models import *
 from app.querybuilder import QueryBuilder
@@ -166,9 +167,13 @@ def view_user(username=None):
 			.order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \
 			.all()
 
+	needs_tags = user.maintained_packages \
+		.filter(Package.state != PackageState.APPROVED) \
+		.filter_by(tags=None).order_by(db.asc(Package.title)).all()
+
 	return render_template("todo/user.html", current_tab="user", user=user,
 			unapproved_packages=unapproved_packages, outdated_packages=outdated_packages,
-			topics_to_add=topics_to_add)
+			needs_tags=needs_tags, topics_to_add=topics_to_add)
 
 
 @bp.route("/todo/outdated/")
diff --git a/app/templates/todo/tags.html b/app/templates/todo/tags.html
index 00058dbc..3b8a44b0 100644
--- a/app/templates/todo/tags.html
+++ b/app/templates/todo/tags.html
@@ -1,7 +1,7 @@
 {% extends "todo/todo_base.html" %}
 
 {% block title %}
-	{{ _("All Package Tags") }}
+	{{ _("Package Tags") }}
 {% endblock %}
 
 {% block content %}
diff --git a/app/templates/todo/todo_base.html b/app/templates/todo/todo_base.html
index cc042d89..4f144460 100644
--- a/app/templates/todo/todo_base.html
+++ b/app/templates/todo/todo_base.html
@@ -26,7 +26,7 @@
 					<li class="nav-item">
 						<a class="nav-link {% if current_tab == "tags" %}active{% endif %}"
 								href="{{ url_for('todo.tags') }}">
-							{{ _("All Package Tags") }}
+							{{ _("Package Tags") }}
 						</a>
 					</li>
 					<li class="nav-item">
diff --git a/app/templates/todo/user.html b/app/templates/todo/user.html
index 49874ffe..feb5edd9 100644
--- a/app/templates/todo/user.html
+++ b/app/templates/todo/user.html
@@ -10,18 +10,16 @@
 		{% for package in unapproved_packages %}
 			<a class="list-group-item list-group-item-action" href="{{ package.getDetailsURL() }}">
 				<div class="row">
-					{% if package %}
-						<div class="col-sm-2 text-muted">
-							<img
-								class="img-fluid"
-								style="max-height: 22px; max-width: 22px;"
-								src="{{ package.getThumbnailOrPlaceholder() }}" />
+					<div class="col-sm-2 text-muted">
+						<img
+							class="img-fluid"
+							style="max-height: 22px; max-width: 22px;"
+							src="{{ package.getThumbnailOrPlaceholder() }}" />
 
-							<span class="pl-2">
-								{{ package.title }}
-							</span>
-						</div>
-					{% endif %}
+						<span class="pl-2">
+							{{ package.title }}
+						</span>
+					</div>
 
 					<div class="col-sm">
 						State: {{ package.state.value }}
@@ -29,7 +27,7 @@
 				</div>
 			</a>
 		{% else %}
-			<p class="list-group-item"><i>{{ _("Nothing to do :)") }}</i></p>
+			<p class="text-muted">{{ _("Nothing to do :)") }}</p>
 		{% endfor %}
 	</div>
 
@@ -51,6 +49,27 @@
 	{% from "macros/todo.html" import render_outdated_packages %}
 	{{ render_outdated_packages(outdated_packages, current_user) }}
 
+	<div class="mt-5"></div>
+	<a class="btn btn-secondary float-right" href="{{ url_for('todo.tags', author=user.username) }}">See All</a>
+	<h2>{{ _("Packages Without Tags") }}</h2>
+	<div class="list-group mt-3 mb-5">
+		{% for package in needs_tags %}
+			<a class="list-group-item list-group-item-action" href="{{ package.getDetailsURL() }}">
+				<img
+					class="img-fluid"
+					style="max-height: 22px; max-width: 22px;"
+					src="{{ package.getThumbnailOrPlaceholder() }}" />
+
+				<span class="pl-2">
+					{{ package.title }}
+				</span>
+			</a>
+		{% else %}
+			<p class="text-muted">{{ _("Nothing to do :)") }}</p>
+		{% endfor %}
+	</div>
+
+
 	<h2 class="mt-5">{{ _("Unadded Topics") }}</h2>
 	{% if topics_to_add %}
 		<p>