diff --git a/monkey_island/cc/services/node.py b/monkey_island/cc/services/node.py
index ca2288974..c196546ca 100644
--- a/monkey_island/cc/services/node.py
+++ b/monkey_island/cc/services/node.py
@@ -51,6 +51,8 @@ class NodeService:
         new_node["accessible_from_nodes"] = accessible_from_nodes
         if len(edges) > 0:
             new_node["services"] = edges[-1]["services"]
+        else:
+            new_node["services"] = []
 
         return new_node
 
diff --git a/monkey_island/cc/ui/src/index.html b/monkey_island/cc/ui/src/index.html
index 784d1e13e..e75b183ca 100644
--- a/monkey_island/cc/ui/src/index.html
+++ b/monkey_island/cc/ui/src/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Monkey Island C&C Server</title>
+  <title>Infection Monkey C&C</title>
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
