diff --git a/fhem/FHEM/55_GDS.pm b/fhem/FHEM/55_GDS.pm
index 1c9f1d2d1..fd4e39089 100644
--- a/fhem/FHEM/55_GDS.pm
+++ b/fhem/FHEM/55_GDS.pm
@@ -130,7 +130,6 @@ sub GDS_Define($$$) {
 sub GDS_Undef($$) {
 	my ($hash, $arg) = @_;
 	my $name = $hash->{NAME};
-	CommandDelete(undef, "gds_web_".$name);
 	RemoveInternalTimer($hash);
 	return undef;
 }
@@ -473,10 +472,8 @@ sub GDS_HTMLTail {
 }
 
 sub GDS_getURL {
-#  my $name = `hostname`;
-#  chop($name);
   my $proto = (AttrVal($FW_wname, 'HTTPS', 0) == 1) ? 'https' : 'http';
-  return $proto."://$FW_httpheader{Host}:" . $defs{$FW_wname}{PORT} . $FW_ME;
+  return $proto."://$FW_httpheader{Host}$FW_ME"; #".$FW_ME;
 }
 
 ####################################################################################################
diff --git a/fhem/contrib/InfoPanel/55_InfoPanel.pm b/fhem/contrib/InfoPanel/55_InfoPanel.pm
index 676f42ad3..5705fb490 100644
--- a/fhem/contrib/InfoPanel/55_InfoPanel.pm
+++ b/fhem/contrib/InfoPanel/55_InfoPanel.pm
@@ -875,7 +875,7 @@ sub btIP_addExtension($$$) {
   
     my $url = "/" . $link;
     $data{FWEXT}{$url}{FUNC} = $func;
-    $data{FWEXT}{$url}{LINK} = "$link";
+    $data{FWEXT}{$url}{LINK} = "+$link";
     $data{FWEXT}{$url}{NAME} = $friendlyname;
     $data{FWEXT}{$url}{FORKABLE} = 0;
 }
@@ -1000,10 +1000,8 @@ sub btIP_Overview {
 }
 
 sub btIP_getURL {
-  my $name = `hostname`;
-  chop($name);
   my $proto = (AttrVal($FW_wname, 'HTTPS', 0) == 1) ? 'https' : 'http';
-  return $proto."://$name:" . $defs{$FW_wname}{PORT} . $FW_ME;
+  return $proto."://$FW_httpheader{Host}$FW_ME";
 }