diff --git a/playbook/re6stnet.yml b/playbook/re6stnet.yml
index 40382d4da2464ba34ce32a383ff43c1a2a77fb3b..a1a1f0cbeeebcb8b82b1e9d1edaf4406d5a29eda 100644
--- a/playbook/re6stnet.yml
+++ b/playbook/re6stnet.yml
@@ -4,7 +4,6 @@
 
   vars:
     - re6st_annon: False
-    - computer_name: noname
     - re6st_fingerprint: nofingerprint
 
   vars_prompt:
@@ -13,6 +12,11 @@
       private: no
       default: "http://re6stnet.nexedi.com/"
 
+    - name: "computer_name"
+      prompt: "Please give a title to your re6st certificate (e.g. your computer name):"
+      private: no
+      default: "noname"
+
     - name: "re6sttoken"
       prompt: "Please insert your re6stnet token:"
       private: no 
diff --git a/playbook/roles/re6stnet-install/tasks/main.yml b/playbook/roles/re6stnet-install/tasks/main.yml
index c824c8d3b2e8b6351a87e3f4bcd4b942e1cc5e86..8e1565551b3d874e9fdc28c7dc96e2d5a9fa750e 100644
--- a/playbook/roles/re6stnet-install/tasks/main.yml
+++ b/playbook/roles/re6stnet-install/tasks/main.yml
@@ -5,25 +5,37 @@
 
   - include: sysctl.yml
 
-  - name: Configure Re6st with re6st-conf
+  - name: Configure Re6st with re6st-conf (with computer_name, fingerprint, no token)
     shell: "re6st-conf --registry {{ re6st_registry_url }} -r title {{ computer_name }} --fingerprint {{ re6st_fingerprint }} -d /etc/re6stnet --anonymous"
-    when: re6st_annon == True and re6stnet_conf.stat.exists == False and "{{ computer_name }}" != "noname"
+    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" == "notoken" and "{{ re6st_fingerprint }}" != "nofingerprint" and "{{ computer_name }}" != "noname"
 
-  - name: Update Facts
-    set_fact: 
-      computer_name: "{{ re6sttoken }}"
-    when: computer_name  == "noname"
+  - name: Configure Re6st with re6st-conf (with computer_name, fingerprint, token)
+    shell: "re6st-conf --registry {{ re6st_registry_url }} -r title {{ computer_name }} --fingerprint {{ re6st_fingerprint }} -d /etc/re6stnet --token {{ re6sttoken }}"
+    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ re6st_fingerprint }}" != "nofingerprint" and "{{ computer_name }}" != "noname"
 
-  - debug: msg="{{ computer_name }}"
+  - name: Configure Re6st with re6st-conf (with computer_name, no fingerprint, no token)
+    shell: "re6st-conf --registry {{ re6st_registry_url }} -r title {{ computer_name }} -d /etc/re6stnet --anonymous"
+    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" == "notoken" and "{{ re6st_fingerprint }}" == "nofingerprint" and "{{ computer_name }}" != "noname"
 
+  - name: Configure Re6st with re6st-conf (with computer_name, no fingerprint, token)
+    shell: "re6st-conf --registry {{ re6st_registry_url }} -r title {{ computer_name }} -d /etc/re6stnet --token {{ re6sttoken }}"
+    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ re6st_fingerprint }}" == "nofingerprint" and "{{ computer_name }}" != "noname"
 
-  - name: Configure Re6st with re6st-conf
-    shell: "re6st-conf --registry {{ re6st_registry_url }} --token {{ re6sttoken }} -r title {{ computer_name }} --fingerprint {{ re6st_fingerprint }} -d /etc/re6stnet"
-    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ re6st_fingerprint }}" != "nofingerprint"
+  - name: Configure Re6st with re6st-conf (with no computer_name, fingerprint, no token)
+    shell: "re6st-conf --registry {{ re6st_registry_url }} --fingerprint {{ re6st_fingerprint }} -d /etc/re6stnet --anonymous"
+    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" == "notoken" and "{{ re6st_fingerprint }}" != "nofingerprint" and "{{ computer_name }}" == "noname"
 
-  - name: Configure Re6st with re6st-conf
-    shell: "re6st-conf --registry {{ re6st_registry_url }} --token {{ re6sttoken }} -r title {{ re6sttoken }} -d /etc/re6stnet"
-    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ re6st_fingerprint }}" == "nofingerprint"
+  - name: Configure Re6st with re6st-conf (with no computer_name, fingerprint, token)
+    shell: "re6st-conf --registry {{ re6st_registry_url }} --fingerprint {{ re6st_fingerprint }} -d /etc/re6stnet --token {{ re6sttoken }}"
+    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ re6st_fingerprint }}" != "nofingerprint" and "{{ computer_name }}" == "noname"
+
+  - name: Configure Re6st with re6st-conf (with no computer_name, no fingerprint, no token)
+    shell: "re6st-conf --registry {{ re6st_registry_url }} -d /etc/re6stnet --anonymous"
+    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" == "notoken" and "{{ re6st_fingerprint }}" == "nofingerprint" and "{{ computer_name }}" == "noname"
+
+  - name: Configure Re6st with re6st-conf (with no computer_name, no fingerprint, token)
+    shell: "re6st-conf --registry {{ re6st_registry_url }} -d /etc/re6stnet --token {{ re6sttoken }}"
+    when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ re6st_fingerprint }}" == "nofingerprint" and "{{ computer_name }}" == "noname"
 
   - name: Recheck if configuration already exists (after running re6st-conf)
     stat: path=/etc/re6stnet/re6stnet.conf
diff --git a/playbook/vifib-re6stnet.yml b/playbook/vifib-re6stnet.yml
index f10afd8cb8593866b536d0bd69beb35ab2efe8d9..33b89dd5b8e0707c806c6e679fcfb44c787099be 100644
--- a/playbook/vifib-re6stnet.yml
+++ b/playbook/vifib-re6stnet.yml
@@ -10,7 +10,7 @@
 
   vars_prompt:
     - name: "computer_name"
-      prompt: "Please insert your email or a name of this computer, it will be used to configure re6st:"
+      prompt: "Please give a title to your re6st certificate (e.g. your computer name):"
       private: no
       default: "noname"