diff --git a/src/se/hal/deamon/PCDataSynchronizationClient.java b/src/se/hal/deamon/PCDataSynchronizationClient.java
index b5e6b8a0..93a81455 100755
--- a/src/se/hal/deamon/PCDataSynchronizationClient.java
+++ b/src/se/hal/deamon/PCDataSynchronizationClient.java
@@ -8,7 +8,6 @@ import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
 
-import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
@@ -41,10 +40,10 @@ public class PCDataSynchronizationClient implements HalDaemon {
 			List<User> users = User.getExternalUsers(db);
 			for(User user : users){
 				if(user.getHostname() == null){
-					logger.fine("Hostname not defined for user: "+ user.getUserName());
+					logger.fine("Hostname not defined for user: "+ user.getUsername());
 					continue;
 				}
-				logger.fine("Synchronizing user: "+ user.getUserName() +" ("+user.getHostname()+":"+user.getPort()+")");
+				logger.fine("Synchronizing user: "+ user.getUsername() +" ("+user.getHostname()+":"+user.getPort()+")");
 				try (Socket s = new Socket(user.getHostname(), user.getPort());){
 					ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
 					ObjectInputStream in = new ObjectInputStream(s.getInputStream());
@@ -52,7 +51,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
                     // Request peer data
                     out.writeObject(new PeerDataReqDTO());
                     PeerDataRspDTO peerData = (PeerDataRspDTO) in.readObject();
-                    user.setUserName(peerData.username);
+                    user.setUsername(peerData.username);
                     user.setAddress(peerData.address);
                     user.save(db);
 
@@ -92,7 +91,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
 								stmt.setFloat(6, data.confidence);
 								DBConnection.exec(stmt);
 							}
-							logger.fine("Stored " + dataList.size() + " entries for sensor " + sensor.getId() + " with offset "+ req.offsetSequenceId +" from " + user.getUserName());
+							logger.fine("Stored " + dataList.size() + " entries for sensor " + sensor.getId() + " with offset "+ req.offsetSequenceId +" from " + user.getUsername());
 						}
                         else
                             logger.fine("Skipped sensor " + sensor.getId());
diff --git a/src/se/hal/deamon/PCDataSynchronizationDaemon.java b/src/se/hal/deamon/PCDataSynchronizationDaemon.java
index bcbb7b74..fc4771c2 100755
--- a/src/se/hal/deamon/PCDataSynchronizationDaemon.java
+++ b/src/se/hal/deamon/PCDataSynchronizationDaemon.java
@@ -75,7 +75,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
                         logger.fine("Client requesting peer data");
                         PeerDataRspDTO rsp = new PeerDataRspDTO();
                         User localUser = User.getLocalUser(db);
-                        rsp.username = localUser.getUserName();
+                        rsp.username = localUser.getUsername();
                         rsp.address = localUser.getAddress();
 
                         rsp.sensors = new ArrayList<>();
diff --git a/src/se/hal/page/PCOverviewHttpPage.java b/src/se/hal/page/PCOverviewHttpPage.java
index 4f43cc8f..09606e3f 100755
--- a/src/se/hal/page/PCOverviewHttpPage.java
+++ b/src/se/hal/page/PCOverviewHttpPage.java
@@ -92,9 +92,9 @@ public class PCOverviewHttpPage extends HalHttpPage {
 	}
 
 	public static class PowerData{
-		long timestamp;
-		String data;
-		String username;
+		public long timestamp;
+		public String data;
+		public String username;
 		public PowerData(long time, String data, String uname) {
 			this.timestamp = time;
 			this.data = data;
diff --git a/src/se/hal/page/UserConfigHttpPage.java b/src/se/hal/page/UserConfigHttpPage.java
index fbeaa35a..902ba890 100755
--- a/src/se/hal/page/UserConfigHttpPage.java
+++ b/src/se/hal/page/UserConfigHttpPage.java
@@ -1,15 +1,11 @@
 package se.hal.page;
 
-import se.hal.ControllerManager;
 import se.hal.HalContext;
 import se.hal.intf.HalHttpPage;
-import se.hal.struct.Sensor;
 import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
-import zutil.ui.Configurator;
-import zutil.ui.Configurator.ConfigurationParam;
 
 import java.util.Map;
 
@@ -38,7 +34,7 @@ public class UserConfigHttpPage extends HalHttpPage {
             switch(request.get("action")) {
                 // Local User
                 case "modify_local_user":
-                    localUser.setUserName(request.get("username"));
+                    localUser.setUsername(request.get("username"));
                     localUser.setAddress(request.get("address"));
                     localUser.save(db);
                     break;
diff --git a/src/se/hal/struct/User.java b/src/se/hal/struct/User.java
index 9bc739a6..cb998a58 100755
--- a/src/se/hal/struct/User.java
+++ b/src/se/hal/struct/User.java
@@ -39,10 +39,10 @@ public class User extends DBBean{
 	
 	
 	
-	public String getUserName() {
+	public String getUsername() {
 		return username;
 	}
-	public void setUserName(String name) {
+	public void setUsername(String name) {
 		this.username = name;
 	}
 	public String getAddress() {