diff --git a/2.System/0_setup.py b/2.System/0_setup.py
index 3ca564051ff35402f1507e90aaa61f0160497323..67b15b207bb32a9fa481a4e395e1ebe41858c246 100644
--- a/2.System/0_setup.py
+++ b/2.System/0_setup.py
@@ -29,13 +29,19 @@ def setup(interactive=True):
     # root
     cmds.append('mkdir -p /root/.ssh')
     cmds.append('chmod 700 /root/.ssh')
-    if utils.exec_cmd(['rgrep', 'support@ubicast', '/root/.ssh']) != 0:
+    code, out = utils.exec_cmd(['rgrep', 'support@ubicast', '/root/.ssh'], get_out=True)
+    if code != 0:
         cmds.append('cat "%s/ubicast_support.pub" >> /root/.ssh/authorized_keys' % dir_path)
+    else:
+        utils.log('The key "ubicast_support.pub" is already in /root/.ssh/authorized_keys.')
     # ubicast
     cmds.append('mkdir -p /home/ubicast/.ssh')
     cmds.append('chmod 700 /home/ubicast/.ssh')
-    if utils.exec_cmd(['rgrep', 'support@ubicast', '/home/ubicast/.ssh']) != 0:
+    code, out = utils.exec_cmd(['rgrep', 'support@ubicast', '/home/ubicast/.ssh'], get_out=True)
+    if code != 0:
         cmds.append('cat "%s/ubicast_support.pub" >> /home/ubicast/.ssh/authorized_keys' % dir_path)
+    else:
+        utils.log('The key "ubicast_support.pub" is already in /home/ubicast/.ssh/authorized_keys.')
     cmds.append('chown -R ubicast:ubicast /home/ubicast/.ssh')
 
     utils.run_commands(cmds)
diff --git a/2.System/ubicast_support.pub b/2.System/ubicast_support.pub
index fb1a72fa1b13a5d68020b9588bd44eaf381dfdd8..523cb03655396114090b55dc5446c32fdc99ab92 100644
--- a/2.System/ubicast_support.pub
+++ b/2.System/ubicast_support.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCr2IJlzvLlLxa2PyGhydAlz/PAOj240g8anQmY58X+llirLHIOlkdJXBqf94jAeZkweWpoE41RdmKPUQEz4pCO09dGJaZD4lv1NtDhrhNwTmoOnyFckoPimR6DX6+UMM9wUmfti/ytljbVEVVo/pRacXmczeumDaci3uYTURyliuAR9h3zbIMQ6D2COESXjptWmEwawE9grsTfJi84Q+XIBPvXRHjjceB5hejUMWuf7xc6GH9WIo5REh3qTUvgtxHtIGLQ3ImOzrbCsEhENrBWds0qH0pIuH0lykWGR6pumpPxLzXcVho+e/UJgUrEg5u6/58aizqJTkxFJMa8ciYz support@ubicast
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCr2IJlzvLlLxa2PyGhydAlz/PAOj240g8anQmY58X+llirLHIOlkdJXBqf94jAeZkweWpoE41RdmKPUQEz4pCO09dGJaZD4lv1NtDhrhNwTmoOnyFckoPimR6DX6+UMM9wUmfti/ytljbVEVVo/pRacXmczeumDaci3uYTURyliuAR9h3zbIMQ6D2COESXjptWmEwawE9grsTfJi84Q+XIBPvXRHjjceB5hejUMWuf7xc6GH9WIo5REh3qTUvgtxHtIGLQ3ImOzrbCsEhENrBWds0qH0pIuH0lykWGR6pumpPxLzXcVho+e/UJgUrEg5u6/58aizqJTkxFJMa8ciYz support@ubicast