diff --git a/FAQ.md b/FAQ.md
index 7429a6a..c3b38bf 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,13 +1,12 @@
-This page tries to list the most frequent problems that can occur during using Ultrasonic, and their solutions. It is a work in progress, and will be updated if our users find something that is worth mentioning here.   
+This page tries to list the most frequent problems that can occur during using Ultrasonic, and their solutions. It is a work in progress, and will be updated if our users find something that is worth mentioning here.
 
-If you can't find an answer to your question here, please check the [issues](https://github.com/ultrasonic/ultrasonic/issues), and do not hesitate to create a [new issue](https://github.com/ultrasonic/ultrasonic/issues/new) for it if necessary. We will try to find a solution for you.
+If you can't find an answer to your question here, please check the [issues](https://gitlab.com/ultrasonic/ultrasonic/issues), and do not hesitate to create a [new issue](https://gitlab.com/ultrasonic/ultrasonic/issues/new) for it if necessary. We will try to find a solution for you.
 
 * ### When I'm trying to connect to my server, Ultrasonic displays an Authentication Error ("Login Failed", or "Authentication by token is not supported for LDAP users"). I know my username and password are correct, what now?
-  In the Server Settings, try to toggle "Force plain password authentication", and test the connection again.  
+  In the Server Settings, try to toggle "Force plain password authentication", and test the connection again.
   Don't forget to save the server settings after the connection test if everything was OK.
-  If you would like to know why and how this helps, or just interested in the dark parts of the Subsonic API, [read on here](https://github.com/ultrasonic/ultrasonic/wiki/Authentication-used-in-the-Subsonic-API).  
+  If you would like to know why and how this helps, or just interested in the dark parts of the Subsonic API, [read on here](Authentication-used-in-the-Subsonic-API).
 
 * ### Why isn't Ultrasonic visible in Android Auto?  
-  The most probable cause is that you've installed Ultrasonic from F-Droid, or from a Github release.  
-  Android Auto only displays applications installed from the Play Store by default, but luckily this can be changed. Please [see this wiki page for details](https://github.com/ultrasonic/ultrasonic/wiki/Using-Ultrasonic-with-Android-Auto).
-
+  The most probable cause is that you've installed Ultrasonic from F-Droid, or from a Github release.
+  Android Auto only displays applications installed from the Play Store by default, but luckily this can be changed. Please [see this wiki page for details](Using-Ultrasonic-with-Android-Auto).