diff --git a/app/scripts/resources/scripts/app/follow_me/index.lua b/app/scripts/resources/scripts/app/follow_me/index.lua
index 6a76b7dda4..918fc26a9b 100644
--- a/app/scripts/resources/scripts/app/follow_me/index.lua
+++ b/app/scripts/resources/scripts/app/follow_me/index.lua
@@ -285,7 +285,11 @@
 				--set the values
 					external = "true";
 					row['user_exists'] = "false";
-					row['accountcode'] = accountcode;
+					if (accountcode ~= nil) then
+						row['accountcode'] = accountcode;
+					else
+						row['accountcode'] = domain_name;
+					end
 				--add the row to the destinations array
 					destinations[x] = row;
 			end