diff --git a/sys/apps/system/password.lua b/sys/apps/system/password.lua
index 4340a73..d822996 100644
--- a/sys/apps/system/password.lua
+++ b/sys/apps/system/password.lua
@@ -7,13 +7,6 @@ local colors   = _G.colors
 local passwordTab = UI.Tab {
 	tabTitle = 'Password',
 	description = 'Wireless network password',
-	oldPass = UI.TextEntry {
-		x = 3, ex = -3, y = 2,
-		limit = 32,
-		mask = true,
-		shadowText = 'old password',
-		inactive = not Security.getPassword(),
-	},
 	newPass = UI.TextEntry {
 		x = 3, ex = -3, y = 3,
 		limit = 32,
@@ -37,15 +30,11 @@ local passwordTab = UI.Tab {
 }
 function passwordTab:eventHandler(event)
 	if event.type == 'update_password' then
-		if #self.newPass.value == 0 then
+		if not self.newPass.value or #self.newPass.value == 0 then
 			self:emit({ type = 'error_message', message = 'Invalid password' })
 
-		elseif Security.getPassword() and not Security.verifyPassword(SHA.compute(self.oldPass.value)) then
-			self:emit({ type = 'error_message', message = 'Passwords do not match' })
-
 		else
 			Security.updatePassword(SHA.compute(self.newPass.value))
-			self.oldPass.inactive = false
 			self:emit({ type = 'success_message', message = 'Password updated' })
 		end
 		return true
diff --git a/sys/init/3.relay.lua b/sys/init/3.relay.lua
index a2132e7..1b24f07 100644
--- a/sys/init/3.relay.lua
+++ b/sys/init/3.relay.lua
@@ -8,10 +8,9 @@ local function register(v)
 			local dev = v.getMethodsRemote(name)
 			if dev then
 				dev.name = name
-				dev.side = name
+				dev.side = v.side
 				dev.type = v.getTypeRemote(name)
 				device[name] = dev
-				table.insert(v._children, dev)
 			end
 		end
 	end