diff --git a/bin/linspector b/bin/linspector
index a7f216c..555db0a 100755
--- a/bin/linspector
+++ b/bin/linspector
@@ -20,7 +20,7 @@ from linspector.environment import Environment
 from linspector.linspector import Linspector
 from linspector.monitors import Monitors
 
-__version__ = '0.26.0'
+__version__ = '0.26.1'
 __author__ = 'Johannes Findeisen <you@hanez.org>'
 
 
diff --git a/files/errors/sqlerror_001.txt b/files/bugs/0001_sqlerror.txt
similarity index 96%
rename from files/errors/sqlerror_001.txt
rename to files/bugs/0001_sqlerror.txt
index 9105f76..ed57d88 100644
--- a/files/errors/sqlerror_001.txt
+++ b/files/bugs/0001_sqlerror.txt
@@ -1,3 +1,7 @@
+# This error is fixed by replacing "'" with "" in the error message of FritzStatus
+# in the vendor.avm.is_connected service. It breaks the SQL statement when there
+# is a "'" in the generated SQL string.
+
 [2023-08-29 14:55:06.350038 +0200] [0:46:32.576412] [INFO] [linspector]: identifier=remote1.port25 host=a.xw3.org service=net.port status=OK
 [2023-08-29 14:55:13.571002 +0200] [0:46:39.797376] [INFO] [linspector]: identifier=remote1.port995 host=a.xw3.org service=net.port status=OK
 [2023-08-29 14:55:14.394669 +0200] [0:46:40.621043] [INFO] [linspector]: identifier=remote1.port110 host=a.xw3.org service=net.port status=OK
diff --git a/linspector/services/net/port.py b/linspector/services/net/port.py
index b5e614e..c87ac87 100644
--- a/linspector/services/net/port.py
+++ b/linspector/services/net/port.py
@@ -28,7 +28,7 @@ class PortService(Service):
             error = str(err)
             status = 'ERROR'
 
-        return {'error': error,
+        return {'error': error.replace('\'', ''),
                 'host': monitor.get_host(),
                 'log': self.get_str(identifier, monitor.get_host(), service, status),
                 'service': service,
diff --git a/linspector/services/vendor/avm/is_connected.py b/linspector/services/vendor/avm/is_connected.py
index 4c9966e..ee34560 100644
--- a/linspector/services/vendor/avm/is_connected.py
+++ b/linspector/services/vendor/avm/is_connected.py
@@ -19,7 +19,9 @@ class IsConnectedService(Service):
 
         try:
             fc = FritzStatus(address=monitor.get_host(),
-                             password=kwargs['password'])
+                             user=kwargs['user'],
+                             password=kwargs['password'],
+                             timeout=10)
             error = 'None'
             if fc.is_connected:
                 status = 'OK'
@@ -29,7 +31,7 @@ class IsConnectedService(Service):
             error = str(err)
             status = 'ERROR'
 
-        result = {'error': error,
+        result = {'error': error.replace('\'', ''),
                   'host': monitor.get_host(),
                   'log': self.get_str(identifier, monitor.get_host(), service, status),
                   'service': service,