diff --git a/api/kiwi_vpn_api/easyrsa.py b/api/kiwi_vpn_api/easyrsa.py
index 2103de1..967fb64 100644
--- a/api/kiwi_vpn_api/easyrsa.py
+++ b/api/kiwi_vpn_api/easyrsa.py
@@ -166,7 +166,7 @@ class EasyRSA:
             config.crypto.ca_password = ca_password
             config.save()
 
-        return config.crypto.ca_password
+        return ca_password
 
     def __easyrsa(
         self,
@@ -276,7 +276,8 @@ class EasyRSA:
             return None
 
         return self.__build_cert(
-            Path(f"issued/{dn.common_name}.crt"),
+            Path("issued").joinpath(f"{dn.common_name}.crt"),
+
             f"build-{cert_type}-full",
             dn.common_name,
             "nopass",