diff --git a/api.php b/api.php
index a65a8fd..41b0db6 100644
--- a/api.php
+++ b/api.php
@@ -189,6 +189,7 @@ if ($values != null || $values != "") {
 	$jsonAnswer = [
 		'device' => [
 			'hostname' => $hostname,
+			'ipAddress' => $device['ip_address'],
 		],
 		'state' => 'succes',
 	];
@@ -223,6 +224,7 @@ if ($values != null || $values != "") {
 		'device' => [
 			'hostname' => $device['name'],
 			'sleepTime' => $device['sleep_time'],
+			'ipAddress' => $device['ip_address'],
 			],
 			'state' => 'succes',
 			'value' => $subDeviceLastReordValue
diff --git a/app/class/DeviceManager.php b/app/class/DeviceManager.php
index 21f8e8e..6ae72ae 100644
--- a/app/class/DeviceManager.php
+++ b/app/class/DeviceManager.php
@@ -23,9 +23,11 @@ class DeviceManager{
 	}
 
 	public function create ($name, $token) {
+		$defaultRoom = RoomManager::getDefaultRoomId();
 		$device = array (
 			'name' => $name,
 			'token' => $token,
+			'room_id' => $defaultRoom,
 		);
 		try {
 			Db::add ('devices', $device);
diff --git a/app/class/NetworkManager.php b/app/class/NetworkManager.php
new file mode 100644
index 0000000..247e0df
--- /dev/null
+++ b/app/class/NetworkManager.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ */
+class NetvorkManager
+{
+
+	function __construct()
+	{
+		// code...
+	}
+
+	function validateIp($ip = '0.0.0.0'){
+		if (!filter_var($ip, FILTER_VALIDATE_IP)){
+			return false;
+		}
+	}
+}
diff --git a/app/class/RoomManager.php b/app/class/RoomManager.php
index 6a2870a..6c71c24 100644
--- a/app/class/RoomManager.php
+++ b/app/class/RoomManager.php
@@ -2,6 +2,11 @@
 class RoomManager{
 	public static $rooms;
 
+	function getDefaultRoomId() {
+		$defaultRoom = Db::loadOne("SELECT id FROM rooms WHERE default = 1");
+		return $defaultRoom['id'];
+	}
+
 	function getAllRooms () {
 		$allRoom = Db::loadAll ("SELECT rooms.*, COUNT(devices.device_id) as device_count FROM rooms LEFT JOIN devices ON (devices.room_id=rooms.room_id) GROUP BY rooms.room_id");
 		return $allRoom;
diff --git a/app/views/Home.php b/app/views/Home.php
index b5156d6..6afa75c 100644
--- a/app/views/Home.php
+++ b/app/views/Home.php
@@ -157,6 +157,7 @@ class Home extends Template
 					'room' => $deviceData['room_id'],
 					'token' => $deviceData['token'],
 					'type' => $deviceData['type'],
+					'ip' => $deviceData['ip_address'],
 					'sleepTime' => $deviceData['sleep_time'],
 					'approved' => $deviceData['approved'],
 					'permission' => $permissionArray,