diff --git a/Show/templates/show.html b/Show/templates/show.html
index 8edd791..e9b052c 100644
--- a/Show/templates/show.html
+++ b/Show/templates/show.html
@@ -30,7 +30,7 @@
 			<div class="season-name">{% if season.name %}{{season.number}} - {{season.name}}{% else %}Season {{season.number}}{%endif%}</div>
 			<div class="episodes">
 				{% for episode in season.episodes.all %}
-					<a class="episode" data-season="{{season.number}}" data-number="{{episode.episode}}" data-title="{{episode.name}}" href="episode/{{season.number}}/{{episode.episode}}">{{episode.episode}} - {{episode.name}}
+					<a class="episode" data-season="{{season.number}}" data-number="{{episode.episode}}" data-title="{{episode.name}}" href="episode/{{season.number}}/{{episode.episode}}-{{episode.name|slugify}}">{{episode.episode}} - {{episode.name}}
 					<span class="submission_cnt">{{episode.submissions.all|length}} Available Links</span>
 					</a>
 				{% endfor %}
diff --git a/Show/urls.py b/Show/urls.py
index 2bfc217..2817b0e 100644
--- a/Show/urls.py
+++ b/Show/urls.py
@@ -20,6 +20,6 @@ from . import views
 
 urlpatterns = [
     url(r'^$', views.IndexView.as_view()),
-    url(r'^episode/(?P<season>\d{1,4})/(?P<episode>\d{1,4})/?$', views.EpisodeView.as_view()),
+    url(r'^episode/(?P<season>\d{1,4})/(?P<episode>\d{1,4})(-[\w-]+)?/?$', views.EpisodeView.as_view()),
     url(r'^vote/(?P<subid>\d+)/(?P<positive>[0-1])/?$', views.SubmissionVoteSubmit.as_view())
 ]