diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements
index 1960454..d00fc3d 100644
--- a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements	
+++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/KeePassXC_Browser_Extension.entitlements	
@@ -4,7 +4,9 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 	<key>com.apple.security.application-groups</key>
-	<string>KeePassXC</string>
+	<string>org.keepassxc.KeePassXC</string>
 </dict>
 </plist>
diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/SafariWebExtensionHandler.swift b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/SafariWebExtensionHandler.swift
index 22c0c99..8de7fbf 100644
--- a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/SafariWebExtensionHandler.swift	
+++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser Extension/SafariWebExtensionHandler.swift	
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2022 KeePassXC Team <team@keepassxc.org>
+ *  Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ var maxMessageLength: Int32 = 1024 * 1024;
 
 class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
     func getSocketPath() -> String {
-        let homePath = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "KeePassXC")?.path
+        let homePath = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "org.keepassxc.KeePassXC")?.path
         return homePath! + "/" + SocketFileName;
     }
     
@@ -95,7 +95,8 @@ class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
         }
         
         if (result == -1) {
-            os_log(.error, "Cannot connect socket %d", errno)
+            let strError = String(utf8String: strerror(errno)) ?? "Unknown error"
+            os_log(.error, "Cannot connect socket: %s", strError)
             return false
         }
         
diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/AppDelegate.swift b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/AppDelegate.swift
index 7abbcbd..b3b34c9 100644
--- a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/AppDelegate.swift
+++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  KeePassXC-Browser
 //
-//  Created by Humanoid on 21.9.2020.
+//  Created by varjolintu on 21.9.2020.
 //
 
 import Cocoa
diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Base.lproj/Main.storyboard b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Base.lproj/Main.storyboard
index 10b5933..ea12834 100644
--- a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Base.lproj/Main.storyboard
+++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/KeePassXC_Browser.entitlements b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/KeePassXC_Browser.entitlements
index f2ef3ae..625af03 100644
--- a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/KeePassXC_Browser.entitlements
+++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/KeePassXC_Browser.entitlements
@@ -2,9 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
-    <true/>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-only</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>
diff --git a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/ViewController.swift b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/ViewController.swift
index 5c8c7d4..92d6256 100644
--- a/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/ViewController.swift
+++ b/keepassxc-browser-safari/KeePassXC-Browser/KeePassXC-Browser/ViewController.swift
@@ -2,7 +2,7 @@
 //  ViewController.swift
 //  KeePassXC-Browser
 //
-//  Created by Humanoid on 21.9.2020.
+//  Created by varjolintu on 21.9.2020.
 //
 
 import Cocoa