diff --git a/appliances/teamplayer/Makefile b/appliances/teamplayer/Makefile
index 38b0bde..6aeeebd 100644
--- a/appliances/teamplayer/Makefile
+++ b/appliances/teamplayer/Makefile
@@ -20,6 +20,7 @@ preinstall:
 
 postinstall: $(post_files) $(SCROBBLER_AUTH) urls.py
 	$(inroot) passwd -d postgres
+	rm -rf $(CHROOT)/var/lib/postgresql/$(PGVER)/data
 	$(inroot) eselect postgresql unset
 	$(inroot) eselect postgresql set $(PGVER)
 	$(inroot) bash -c "echo y |$(EMERGE) --config postgresql:$(PGVER)"
diff --git a/appliances/teamplayer/make.conf b/appliances/teamplayer/make.conf
index afc0fde..6d96234 100644
--- a/appliances/teamplayer/make.conf
+++ b/appliances/teamplayer/make.conf
@@ -1,5 +1,5 @@
 
 # Settings for TeamPlayer
 NGINX_MODULES_HTTP="auth_basic gzip proxy referer rewrite headers_more uwsgi"
-USE_PYTHON="3.4"
-PYTHON_TARGETS="python3_4"
+USE_PYTHON="3.6"
+PYTHON_TARGETS="python3_6"
diff --git a/appliances/teamplayer/urls.py b/appliances/teamplayer/urls.py
index bf5e81e..2f685d9 100644
--- a/appliances/teamplayer/urls.py
+++ b/appliances/teamplayer/urls.py
@@ -1,8 +1,8 @@
 from django.conf.urls import include, url
 
-from django.contrib.auth.views import login as django_login
+from django.contrib.auth.views import LoginView
 
 urlpatterns = [
-    url(r'^accounts/login/$', django_login),
+    url(r'^accounts/login/$', LoginView.as_view()),
     url(r'', include('teamplayer.urls')),
 ]