diff --git a/combo/apps/wcs/__init__.py b/combo/apps/wcs/__init__.py
index 080e1c0c..5aff7e40 100644
--- a/combo/apps/wcs/__init__.py
+++ b/combo/apps/wcs/__init__.py
@@ -18,6 +18,7 @@ import hashlib
 
 import django.apps
 from django.core.urlresolvers import reverse
+from django.utils.encoding import force_bytes
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 
 
@@ -45,7 +46,7 @@ class AppConfig(django.apps.AppConfig):
             label = pgettext_lazy('user-forms', 'Forms')
             if len(services.keys()) > 1:
                 label = pgettext_lazy('user-forms', 'Forms (%s)') % service['title']
-            engines['formdata:%s' % hashlib.md5(key).hexdigest()[:8]] = {
+            engines['formdata:%s' % hashlib.md5(force_bytes(key)).hexdigest()[:8]] = {
                 'url': service['url'] + 'api/forms/?NameID={{user_nameid}}&status=all&ignore-roles=on&q=%(q)s',
                 'label': label,
                 'signature': True,
diff --git a/combo/manager/views.py b/combo/manager/views.py
index 04dfae4c..bae8a641 100644
--- a/combo/manager/views.py
+++ b/combo/manager/views.py
@@ -25,7 +25,7 @@ from django.core.urlresolvers import reverse, reverse_lazy
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import force_text
+from django.utils.encoding import force_text, force_bytes
 from django.utils.formats import date_format
 from django.utils.timezone import localtime
 from django.views.decorators.csrf import requires_csrf_token
@@ -475,7 +475,7 @@ def page_order(request):
     if slug_conflict:
         # slug conflict after a page got moved, reload and rename
         moved_page = Page.objects.get(id=request.GET['moved-page-id'])
-        moved_page.slug = moved_page.slug + '-' + hashlib.md5(str(moved_page.id)).hexdigest()[:4]
+        moved_page.slug = moved_page.slug + '-' + hashlib.md5(force_bytes(moved_page.id)).hexdigest()[:4]
         moved_page.save()
     return redirect(reverse('combo-manager-homepage'))