diff --git a/machines/forms.py b/machines/forms.py
index a0172763..0c7d9cd4 100644
--- a/machines/forms.py
+++ b/machines/forms.py
@@ -70,11 +70,12 @@ class AliasForm(ModelForm):
 
     def __init__(self, *args, **kwargs):
         infra = kwargs.pop('infra')
-        name_user = kwargs.pop('name_user')
-        nb_machine = kwargs.pop('nb_machine')
-        initial = kwargs.get('initial', {})
-        initial['name'] = name_user.lower()+str(nb_machine)
-        kwargs['initial'] = initial 
+        if 'name_user' in kwargs:
+            name_user = kwargs.pop('name_user')
+            nb_machine = kwargs.pop('nb_machine')
+            initial = kwargs.get('initial', {})
+            initial['name'] = name_user.lower()+str(nb_machine)
+            kwargs['initial'] = initial 
         super(AliasForm, self).__init__(*args, **kwargs)
         if not infra:
             self.fields['extension'].queryset = Extension.objects.filter(need_infra=False)
diff --git a/machines/views.py b/machines/views.py
index bd09cd84..c2cb638b 100644
--- a/machines/views.py
+++ b/machines/views.py
@@ -100,7 +100,7 @@ def new_machine(request, userid):
     machine = NewMachineForm(request.POST or None)
     interface = AddInterfaceForm(request.POST or None, infra=request.user.has_perms(('infra',))) 
     nb_machine = Interface.objects.filter(machine__user=userid).count()
-    domain = AliasForm(request.POST or None, infra=request.user.has_perms(('infra',)), name_user=request.user.surname, nb_machine=nb_machine)
+    domain = AliasForm(request.POST or None, infra=request.user.has_perms(('infra',)), name_user=user.surname, nb_machine=nb_machine)
     if machine.is_valid() and interface.is_valid():
         new_machine = machine.save(commit=False)
         new_machine.user = user