diff --git a/roles/remoteit/tasks/main.yml b/roles/remoteit/tasks/main.yml
index c66cd921a..f152c6b52 100644
--- a/roles/remoteit/tasks/main.yml
+++ b/roles/remoteit/tasks/main.yml
@@ -18,6 +18,9 @@
 
 - include_tasks: enable-or-disable.yml
 
+- name: Find the claim code if blank the machine was registrated
+  shell: grep claim /etc/remoteit/config.json | rev | cut -d\" -f2 | rev
+  register: remoteit_claim
 
 - name: Add 'remoteit' variable values to {{ iiab_ini_file }}
   ini_file:
@@ -34,3 +37,5 @@
       value: "{{ remoteit_install }}"
     - option: remoteit_enabled
       value: "{{ remoteit_enabled }}"
+    - option: remoteit_claim_code
+      value: "{{ remoteit_claim.stdout }}"