diff --git a/.travis.yml b/.travis.yml
index 86b534e386..9eef3780d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ env:
     global:
         - SECRET_KEY=SecretKeyForTravis
         - DATABASE_URL="postgis://postgres@localhost:5432/travis_ci_test"
-        - DEFAULT_HOST="wildlifelicensing"
 install:
     - pip install -r requirements.txt
     - pip install coveralls
diff --git a/wildlifelicensing/apps/applications/views/entry.py b/wildlifelicensing/apps/applications/views/entry.py
index 9ae4867292..96b72d0420 100755
--- a/wildlifelicensing/apps/applications/views/entry.py
+++ b/wildlifelicensing/apps/applications/views/entry.py
@@ -379,7 +379,7 @@ def get_context_data(self, **kwargs):
                                                           initial_email=application.applicant.email,
                                                           user=application.applicant)
 
-        kwargs['address_form'] = AddressForm()
+        kwargs['address_form'] = AddressForm(user=application.applicant)
 
         return super(CreateSelectProfileView, self).get_context_data(**kwargs)
 
@@ -400,7 +400,7 @@ def post(self, request, *args, **kwargs):
                 return render(request, self.template_name, {'licence_type': application.licence_type,
                                                             'profile_selection_form': profile_selection_form,
                                                             'profile_creation_form': ProfileForm(),
-                                                            'address_form': AddressForm()})
+                                                            'address_form': AddressForm(user=application.applicant)})
         elif 'create' in request.POST:
             profile_form = ProfileForm(request.POST)
             address_form = AddressForm(request.POST)
diff --git a/wildlifelicensing/apps/customer_management/views/customer.py b/wildlifelicensing/apps/customer_management/views/customer.py
index 6e06a63cb5..d2c3848b9a 100644
--- a/wildlifelicensing/apps/customer_management/views/customer.py
+++ b/wildlifelicensing/apps/customer_management/views/customer.py
@@ -248,7 +248,7 @@ def get_context_data(self, **kwargs):
             kwargs['address_form'] = AddressForm(instance=profile.postal_address)
         else:
             kwargs['profile_form'] = ProfileForm(user=customer)
-            kwargs['address_form'] = AddressForm()
+            kwargs['address_form'] = AddressForm(user=customer)
 
         return super(EditProfileView, self).get_context_data(**kwargs)
 
diff --git a/wildlifelicensing/apps/main/excel.py b/wildlifelicensing/apps/main/excel.py
index 737cecc620..d5ad65536e 100644
--- a/wildlifelicensing/apps/main/excel.py
+++ b/wildlifelicensing/apps/main/excel.py
@@ -3,6 +3,7 @@
 from openpyxl.worksheet.datavalidation import DataValidation
 from openpyxl.utils import get_column_letter
 
+from django.utils import six
 from django.utils.text import Truncator
 from django.http import HttpResponse
 
@@ -62,7 +63,7 @@ def is_blank_value(value):
 
 
 def is_empty_string(value):
-    return isinstance(value, basestring) and len(value.strip()) == 0
+    return isinstance(value, six.string_types) and len(value.strip()) == 0
 
 
 def is_cell_blank(cell):
@@ -74,7 +75,7 @@ def is_all_blanks(cells):
 
 
 def strip(value):
-    return value.strip() if isinstance(value, basestring) else value
+    return value.strip() if isinstance(value, six.string_types) else value
 
 
 def get_value_for_key(ws, key, direction='down'):
diff --git a/wildlifelicensing/apps/main/forms.py b/wildlifelicensing/apps/main/forms.py
index 9959d1882f..00093ff8fc 100755
--- a/wildlifelicensing/apps/main/forms.py
+++ b/wildlifelicensing/apps/main/forms.py
@@ -2,6 +2,7 @@
 import os
 from datetime import datetime
 
+from django.utils import six
 from django import forms
 from django.contrib.postgres.forms import JSONField
 from django.forms.widgets import SelectMultiple
@@ -26,7 +27,7 @@ def __init__(self, **kwargs):
     def prepare_value(self, value):
         if value is None:
             return ""
-        if isinstance(value, basestring):
+        if isinstance(value, six.string_types):
             # already a string
             return value
         else:
diff --git a/wildlifelicensing/apps/returns/utils_schema.py b/wildlifelicensing/apps/returns/utils_schema.py
index bb5fbe39ca..bfe685d0c3 100644
--- a/wildlifelicensing/apps/returns/utils_schema.py
+++ b/wildlifelicensing/apps/returns/utils_schema.py
@@ -3,7 +3,7 @@
 from openpyxl import Workbook
 from openpyxl.styles import Font
 from openpyxl.writer.write_only import WriteOnlyCell
-
+from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 
 from wildlifelicensing.apps.main.excel import is_blank_value
@@ -50,9 +50,9 @@ def cast(self, value):
         if is_blank_value(value):
             # must do that because an empty string is considered as valid even if required by the StringType
             value = None
-        if isinstance(value, basestring):
+        if isinstance(value, six.string_types) and not isinstance(value, six.text_type):
             # the StringType accepts only unicode
-            value = unicode(value)
+            value = six.u(value)
         return self.type.cast(value)
 
     def validate(self, value):