diff --git a/main.pas b/main.pas
index 223d7f1..c4f2245 100644
--- a/main.pas
+++ b/main.pas
@@ -4971,7 +4971,7 @@ var
   begin
   s:=ansistring(HSlib.encodeURL(data.lastFN));
   conn.addHeader( ansistring('Content-Disposition: '+if_(attach, 'attachment; ')
-    +'filename*=UTF-8''''"'+s+'"; filename="'+s+'"'));
+    +'filename*=UTF-8'''''+s+'; filename='+s));
   end;
 
   function sessionRedirect():boolean;
diff --git a/scriptLib.pas b/scriptLib.pas
index 27fc1ad..ca40d98 100644
--- a/scriptLib.pas
+++ b/scriptLib.pas
@@ -1472,7 +1472,8 @@ var
     exit;
     end;
   a:=findEnabledLinkedAccount(a, split(';',s));
-  if assigned(a) then result:=a.user;
+  if assigned(a) then
+    result:=a.user;
   end; // memberOf
 
   procedure canArchive(f:Tfile);