diff --git a/get_together/templates/get_together/base.html b/get_together/templates/get_together/base.html
index 37776fd..d7bf68a 100644
--- a/get_together/templates/get_together/base.html
+++ b/get_together/templates/get_together/base.html
@@ -60,6 +60,9 @@
           {% endcomment %}
         </ul>
         <ul class="navbar-nav">
+          <li class="nav-item active">
+            <a class="btn btn-primary" href="{% url 'create-event-team-select' %}"><i class="fa fa fa-calendar-plus-o"></i> Host a Get Together</a>
+          </li>
             {% if request.user.is_authenticated %}
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarUserMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/get_together/views/events.py b/get_together/views/events.py
index 70c4b7a..f912a1b 100644
--- a/get_together/views/events.py
+++ b/get_together/views/events.py
@@ -97,6 +97,8 @@ def show_series(request, series_id, series_slug):
 @login_required
 def create_event_team_select(request):
     teams = request.user.profile.moderating
+    if len(teams) == 0:
+        return redirect('create-team')
     if len(teams) == 1:
         return redirect('create-event', team_id=teams[0].id)