diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java
index 8cef8e3..82750e7 100644
--- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java	
+++ b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java	
@@ -664,4 +664,15 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
         //Overwrite item at current position
         ((CubotInventory) getHardware(CubotInventory.class)).putItem(item);
     }
+
+    @Override
+    public String toString() {
+        StringBuilder str = new StringBuilder(super.toString());
+
+        str.append("\nHardware: \n");
+        for (Integer i : hardwareAddresses.keySet()) {
+            str.append(String.format("%04X", i)).append(":").append(hardwareAddresses.get(i)).append("\n");
+        }
+        return str.toString();
+    }
 }
diff --git a/Server/src/main/resources/templates/account.vm b/Server/src/main/resources/templates/account.vm
index dadc22a..7fdf4dd 100644
--- a/Server/src/main/resources/templates/account.vm
+++ b/Server/src/main/resources/templates/account.vm
@@ -71,9 +71,10 @@
                         <p>Moderator: $user.isModerator()</p>
 
                         <h5>CPU</h5>
-                        <pre>$user.getCpu()</pre>
+                        <pre>$user.getControlledUnit().getCpu()</pre>
 
                         <h5>Controlled unit</h5>
+                        <p>$user.getControlledUnit()</p>
                         <p>id: $user.getControlledUnit().getObjectId()</p>
                         <p>energy: $user.getControlledUnit().getEnergy()</p>
                         <p>x: $user.getControlledUnit().getX()</p>