diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 0856a5f183..a600d1b59f 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -18,9 +18,9 @@ Row {
     // Spacing
     spacing: 10;
     // Anchors
-    //anchors.topMargin: 10;
+    anchors.topMargin: 10;
     anchors.leftMargin: 10;
-    //anchors.verticalCenter: parent.verticalCenter
+    anchors.verticalCenter: parent.verticalCenter;
 
     // Properties
     property string displayName: "";
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 502ff16971..1c7fa067f6 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -109,6 +109,7 @@ Rectangle {
 
         // This Rectangle refers to each Row in the table.
         rowDelegate: Rectangle { // The only way I know to specify a row height.
+            // Size
             height: rowHeight;
             // The rest of this is cargo-culted to restore the default styling
             SystemPalette {
@@ -126,6 +127,9 @@ Rectangle {
             id: itemCell;
             property bool isCheckBox: typeof(styleData.value) === 'boolean';
             property bool isSeparator: styleData.value === '';
+            // Anchors
+            anchors.topMargin: 10;
+            anchors.bottomMargin: anchors.topMargin;
             // This NameCard refers to the cell that contains an avatar's
             // DisplayName and UserName
             NameCard {
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index b66d9afa67..e5d28e4174 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -145,7 +145,7 @@ function usernameFromIDReply(id, username, machineFingerprint) {
         data = ['', username]
     } else {
         // Set the data to contain the ID and the username+ID concat string.
-        data = [id, username + '/' + machineFingerprint];
+        data = [id, username || machineFingerprint];
     }
     print('Username Data:', JSON.stringify(data));
     // Ship the data off to QML