diff --git a/user-guide/linux_terminalserver.md b/user-guide/linux_terminalserver.md
index 10aebeb8..eac2510b 100644
--- a/user-guide/linux_terminalserver.md
+++ b/user-guide/linux_terminalserver.md
@@ -2,9 +2,10 @@
 
 It is possible connect to a Linux terminal server using
 - RDP/Remote Desktop Connection: `lx-term.psi.ch`
-- Browser: [`nx-term.psi.ch`](https:nx-term.psi.ch)
+- Browser: [nx-term.psi.ch](https:nx-term.psi.ch)
 - NoMachine: `nx-term.psi.ch`
 
+A disconnected session will be automatically closed after 4 day. And on the first Monday of the month the servers get updated and rebooted which will also end all running sessions.
 
 ## RDP to lx-term.psi.ch
 
@@ -13,3 +14,29 @@ You can use "Remote Desktop Connection" or any other RDP client like Remmina or
 ![Start Remote Desktop Connection](linux_terminalserver/rdp_connect.png)
 
 ![login on terminalserver](linux_terminalserver/rdp_login.png)
+
+## Browser to nx-term.psi.ch
+Connect your web browser [https://nx-term.psi.ch](https:nx-term.psi.ch) and log in with your PSI AD account:
+
+
+![connect browser](linux_terminalserver/browser_connect.png)
+
+## NoMachine to nx-term.psi.ch
+
+Note that the normal free NoMachine product is not licensed for academic use. Please download the NoMachine Enterprise Client (at the bottom of the [download page](https://downloads.nomachine.com/download-enterprise/)) which is free to use as well.
+
+To connect start the NoMachine client. On the first time you need to create a new connection by clicking on "Add" below "Machines" on the top left:
+
+![nx add connection](linux_terminalserver/nx_add.png)
+
+Now configure the connection with "Host" `nx-term.psi.ch`, a recognizable name at "Name" and finally click on the "Add" button in the top right corner:
+
+![nx configure connection](linux_terminalserver/nx_configure.png)
+
+There is a new icon with given name to double click on:
+
+![nx connect](linux_terminalserver/nx_connect.png)
+
+Finally enter your PSI AD username and password:
+
+![nx login](linux_terminalserver/nx_login.png)
diff --git a/user-guide/linux_terminalserver/browser_connect.png b/user-guide/linux_terminalserver/browser_connect.png
new file mode 100644
index 00000000..a9ae7b55
Binary files /dev/null and b/user-guide/linux_terminalserver/browser_connect.png differ
diff --git a/user-guide/linux_terminalserver/nx_add.png b/user-guide/linux_terminalserver/nx_add.png
new file mode 100644
index 00000000..56ee2a5a
Binary files /dev/null and b/user-guide/linux_terminalserver/nx_add.png differ
diff --git a/user-guide/linux_terminalserver/nx_configure.png b/user-guide/linux_terminalserver/nx_configure.png
new file mode 100644
index 00000000..7a616db9
Binary files /dev/null and b/user-guide/linux_terminalserver/nx_configure.png differ
diff --git a/user-guide/linux_terminalserver/nx_connect.png b/user-guide/linux_terminalserver/nx_connect.png
new file mode 100644
index 00000000..043f582e
Binary files /dev/null and b/user-guide/linux_terminalserver/nx_connect.png differ
diff --git a/user-guide/linux_terminalserver/nx_login.png b/user-guide/linux_terminalserver/nx_login.png
new file mode 100644
index 00000000..9cfbf26b
Binary files /dev/null and b/user-guide/linux_terminalserver/nx_login.png differ