diff --git a/flowspec/views.py b/flowspec/views.py
index fdf230b0da467c5ac827e6f6535d682d484b9edb..2f28678683b36fdd110816ba7ff39f084b57ad61 100644
--- a/flowspec/views.py
+++ b/flowspec/views.py
@@ -941,9 +941,9 @@ def setup(request):
 
                 with open("flowspy/settings_local.py", "a") as f:
                     f.write("NETCONF_DEVICE = \"%s\"\n" % form.cleaned_data["netconf_device"])
-                    f.write("NETCONF_USER = \"%s\"\n"   % form.cleaned_data["netconf_port"])
-                    f.write("NETCONF_PASS = \"%s\"\n"   % form.cleaned_data["netconf_user"])
-                    f.write("NETCONF_PORT = %s\n"       % form.cleaned_data["netconf_pass"])
+                    f.write("NETCONF_USER = \"%s\"\n"   % form.cleaned_data["netconf_user"])
+                    f.write("NETCONF_PASS = \"%s\"\n"   % form.cleaned_data["netconf_pass"])
+                    f.write("NETCONF_PORT = %s\n"       % form.cleaned_data["netconf_port"])
 
                 logger.error('TODO REMOVE: password: %s' % form.cleaned_data["password"])
                 return HttpResponseRedirect(reverse("welcome"))
diff --git a/flowspy/settings.py.dist b/flowspy/settings.py.dist
index be062610e22ac9c4e635bb4043c87167697a042b..2c9800147c188d224fb98f005e1bd6dc76333a36 100644
--- a/flowspy/settings.py.dist
+++ b/flowspy/settings.py.dist
@@ -469,3 +469,14 @@ STATISTICS_PER_RULE__ADD_INITIAL_ZERO = True
 ##############################################################################
 ##############################################################################
 
+#MYSETTING1="default"
+#from settings_local import *
+from flowspy.settings_local import *
+
+#print "MYSETTING1="+MYSETTING1
+#print("MYSETTING1="+MYSETTING1, file=sys.stderr)
+#print "debug settings.NOTIFY_ADMIN_MAILS="+str(NOTIFY_ADMIN_MAILS)
+
+##############################################################################
+##############################################################################
+