diff --git a/apps/Network.lua b/apps/Network.lua
index 7a77fa7..155ca0d 100644
--- a/apps/Network.lua
+++ b/apps/Network.lua
@@ -22,6 +22,7 @@ local page = UI.Page {
     buttons = {
       { text = 'Telnet', event = 'telnet' },
       { text = 'VNC',    event = 'vnc'    },
+      { text = 'Trust',  event = 'trust'  },
       { text = 'Reboot', event = 'reboot' },
     },
   },
@@ -39,7 +40,7 @@ local page = UI.Page {
   },
 }
 
-function sendCommand(host, command)
+local function sendCommand(host, command)
 
   if not device.wireless_modem then
     page.notification:error('Wireless modem not present')
@@ -76,6 +77,8 @@ function page:eventHandler(event)
         args = { t.id },
         title = t.label,
       })
+    elseif event.type == 'trust' then
+      shell.run('trust ' .. t.id)
     elseif event.type == 'reboot' then
       sendCommand(t.id, 'reboot')
     elseif event.type == 'shutdown' then
diff --git a/apps/password.lua b/apps/password.lua
index 9a4d309..3f5a152 100644
--- a/apps/password.lua
+++ b/apps/password.lua
@@ -1,20 +1,10 @@
 require = requireInjector(getfenv(1))
-local Config = require('config')
 local SHA1 = require('sha1')
 local Terminal = require('terminal')
 
-local config = {
-  enable = false,
-  pocketId = 10,
-  distance = 8,
-}
-
-Config.load('os', config)
-
 local password = Terminal.readPassword('Enter new password: ')
 
 if password then
-  config.password = SHA1.sha1(password)
-  Config.update('os', config)
+  os.updatePassword(SHA1.sha1(password))
   print('Password updated')
 end
diff --git a/sys/extensions/os.lua b/sys/extensions/os.lua
index 289f88a..148f688 100644
--- a/sys/extensions/os.lua
+++ b/sys/extensions/os.lua
@@ -61,10 +61,18 @@ function os.verifyPassword(password)
 end
 
 function os.getSecretKey()
-  if not fs.exists('.secret') then
-    Util.writeFile('.secret', math.random(100000, 999999))
+  Config.load('os', config)
+  if not os.secretKey then
+    os.secretKey = math.random(100000, 999999)
+    Config.update('os', config)
   end
-  return Util.readFile('.secret')
+  return os.secretKey
+end
+
+function os.updatePassword(password)
+  Config.load('os', config)
+  config.password = password
+  Config.update('os', config)
 end
 
 function os.getPassword()
diff --git a/sys/network/trust.lua b/sys/network/trust.lua
index 6a981da..c6fbca4 100644
--- a/sys/network/trust.lua
+++ b/sys/network/trust.lua
@@ -24,7 +24,7 @@ process:newThread('trust_server', function()
 
           socket:write('Trust accepted')
         else
-          socket:write('Invalid password or password is not set')
+          socket:write('Invalid password')
         end
       end
     end