diff --git a/workflows/views.py b/workflows/views.py
index 2b03934af44c1032d82ad0d9142dfc1705295f33..9fb985442232a39c2df69127116dd13471f19427 100644
--- a/workflows/views.py
+++ b/workflows/views.py
@@ -659,17 +659,18 @@ def add_input(request):
                 widget.name = 'Input'
                 widget.type = 'input'
                 widget.save()
+                variable_name = 'Input'+str(widget.pk)
                 output = Output()
                 output.name = 'Input'
                 output.short_name = 'inp'
-                output.variable = 'Input'
+                output.variable = variable_name
                 output.widget = widget
                 output.save()
                 input = Input()
                 input.widget = workflow.widget
                 input.name = 'Input'
                 input.short_name = 'inp'
-                input.variable = 'Input'
+                input.variable = variable_name
                 input.inner_output = output
                 input.save()
                 output.outer_input = input
@@ -705,17 +706,18 @@ def add_output(request):
                 widget.name = 'Output'
                 widget.type = 'output'
                 widget.save()
+                variable_name = 'Output'+str(widget.pk)
                 input = Input()
                 input.name = 'Output'
                 input.short_name = 'out'
-                input.variable = 'Output'
+                input.variable = variable_name
                 input.widget = widget
                 input.save()
                 output = Output()
                 output.widget = workflow.widget
                 output.name = 'Output'
                 output.short_name = 'out'
-                output.variable = 'Output'
+                output.variable = variable_name
                 output.inner_input = input
                 output.save()
                 input.outer_output = output
@@ -1175,7 +1177,7 @@ def widget_results(request):
         return s
     if request.is_ajax() or DEBUG:
         w = get_object_or_404(Widget, pk=request.POST['widget_id'])
-        if (w.workflow.user==request.user):
+        if request.user == w.workflow.user:
             import pprint
             input_dict = {}
             output_dict = {}