diff --git a/apps/OpenSign/src/pages/UserProfile.js b/apps/OpenSign/src/pages/UserProfile.js
index 3803e43cf..625e103be 100644
--- a/apps/OpenSign/src/pages/UserProfile.js
+++ b/apps/OpenSign/src/pages/UserProfile.js
@@ -449,22 +449,22 @@ function UserProfile() {
                   )}
                 </span>
               </li>
-              {!isEnableSubscription && (
-                <li className="flex justify-between items-center border-t-[1px] border-gray-300 py-2 break-all">
-                  <span className="font-semibold">Public profile:</span>
-                  <div className="flex items-center">
-                    <span>opensign.me/</span>
+              {/* {!isEnableSubscription && ( */}
+              <li className="flex justify-between items-center border-t-[1px] border-gray-300 py-2 break-all">
+                <span className="font-semibold">Public profile:</span>
+                <div className="flex items-center">
+                  <span>opensign.me/</span>
 
-                    <input
-                      onChange={handlePublicUrl}
-                      value={publicUserName}
-                      disabled={!editmode}
-                      placeholder="enter user name"
-                      className="border-[1px] border-gray-200 rounded-[3px]"
-                    />
-                  </div>
-                </li>
-              )}
+                  <input
+                    onChange={handlePublicUrl}
+                    value={publicUserName}
+                    disabled={!editmode}
+                    placeholder="enter user name"
+                    className="border-[1px] border-gray-200 rounded-[3px]"
+                  />
+                </div>
+              </li>
+              {/* )} */}
 
               <li className="border-y-[1px] border-gray-300 break-all">
                 <div className="flex justify-between items-center py-2">
diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js
index 8cf06e6b0..7fb1a0b7f 100644
--- a/apps/OpenSign/src/primitives/GetReportDisplay.js
+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js
@@ -6,8 +6,8 @@ import ModalUi from "./ModalUi";
 import AddSigner from "../components/AddSigner";
 import {
   modalSubmitBtnColor,
-  modalCancelBtnColor,
-  isEnableSubscription
+  modalCancelBtnColor
+  // isEnableSubscription
 } from "../constant/const";
 import Alert from "./Alert";
 import Tooltip from "./Tooltip";
@@ -857,7 +857,8 @@ const ReportTable = (props) => {
               {props.actions?.length > 0 && (
                 <th className="px-4 py-2 font-thin">Action</th>
               )}
-              {props.ReportName === "Templates" && !isEnableSubscription && (
+              {props.ReportName === "Templates" && (
+                // && !isEnableSubscription
                 <th className="px-4 py-2 font-thin">Public</th>
               )}
             </tr>
@@ -1299,167 +1300,165 @@ const ReportTable = (props) => {
                           </ModalUi>
                         )}
                       </td>
-                      {!isEnableSubscription && (
-                        <td className=" pl-[20px] py-2    ">
-                          {props.ReportName === "Templates" && (
-                            <div className="  flex flex-row-">
-                              <label
-                                className={
-                                  "cursor-pointer relative inline-flex items-center mb-0"
+                      {/* {!isEnableSubscription && ( */}
+                      <td className=" pl-[20px] py-2    ">
+                        {props.ReportName === "Templates" && (
+                          <div className="  flex flex-row-">
+                            <label
+                              className={
+                                "cursor-pointer relative inline-flex items-center mb-0"
+                              }
+                            >
+                              <input
+                                checked={
+                                  (isPublic && isPublic[item.objectId]) ||
+                                  item?.IsPublic ||
+                                  false
                                 }
-                              >
-                                <input
-                                  checked={
-                                    (isPublic && isPublic[item.objectId]) ||
-                                    item?.IsPublic ||
-                                    false
-                                  }
-                                  onChange={(e) => handlePublicChange(e, item)}
-                                  type="checkbox"
-                                  value=""
-                                  className="sr-only peer"
-                                />
-                                <div className="w-9 h-5 bg-gray-200 peer-focus:outline-none peer-focus:ring-1 peer-focus:ring-black rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-4 after:w-4 after:transition-all dark:border-black peer-checked:bg-blue-600"></div>
-                              </label>
-                            </div>
-                          )}
-                          {isMakePublic[item.objectId] && (
-                            <ModalUi
-                              isOpen
-                              title={"Make template public"}
-                              handleClose={() => {
-                                setIsMakePublic({});
-                                setSelectedPublicRole("");
-                                setIsPublic({});
-                              }}
-                            >
-                              <div className="m-[20px]">
-                                <div className="font-normal text-black">
-                                  <p className="text-lg">
-                                    {" "}
-                                    {isPublic[item.objectId]
-                                      ? `Are you sure you want to make this template
+                                onChange={(e) => handlePublicChange(e, item)}
+                                type="checkbox"
+                                value=""
+                                className="sr-only peer"
+                              />
+                              <div className="w-9 h-5 bg-gray-200 peer-focus:outline-none peer-focus:ring-1 peer-focus:ring-black rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-4 after:w-4 after:transition-all dark:border-black peer-checked:bg-blue-600"></div>
+                            </label>
+                          </div>
+                        )}
+                        {isMakePublic[item.objectId] && (
+                          <ModalUi
+                            isOpen
+                            title={"Make template public"}
+                            handleClose={() => {
+                              setIsMakePublic({});
+                              setSelectedPublicRole("");
+                              setIsPublic({});
+                            }}
+                          >
+                            <div className="m-[20px]">
+                              <div className="font-normal text-black">
+                                <p className="text-lg">
+                                  {" "}
+                                  {isPublic[item.objectId]
+                                    ? `Are you sure you want to make this template
             public ?`
-                                      : `Are you sure you want to make this template
+                                    : `Are you sure you want to make this template
               private ?`}
-                                  </p>
-                                  {isPublic[item.objectId] && (
-                                    <div className="flex mt-2 gap-2 md:items-center">
-                                      <p className="text-[15px]">
-                                        Public role :{" "}
-                                      </p>
-                                      {role.length > 1 ? (
-                                        <select
-                                          className="w-[60%] md:w-[70%] border-[1px] border-gray-200 rounded-sm p-[2px]"
-                                          name="textvalidate"
-                                          value={selectedPublicRole}
-                                          onChange={(e) =>
-                                            setSelectedPublicRole(
-                                              e.target.value
-                                            )
-                                          }
+                                </p>
+                                {isPublic[item.objectId] && (
+                                  <div className="flex mt-2 gap-2 md:items-center">
+                                    <p className="text-[15px]">
+                                      Public role :{" "}
+                                    </p>
+                                    {role.length > 1 ? (
+                                      <select
+                                        className="w-[60%] md:w-[70%] border-[1px] border-gray-200 rounded-sm p-[2px]"
+                                        name="textvalidate"
+                                        value={selectedPublicRole}
+                                        onChange={(e) =>
+                                          setSelectedPublicRole(e.target.value)
+                                        }
+                                      >
+                                        <option
+                                          disabled
+                                          style={{ fontSize: "13px" }}
+                                          value=""
                                         >
-                                          <option
-                                            disabled
-                                            style={{ fontSize: "13px" }}
-                                            value=""
-                                          >
-                                            Select...
-                                          </option>
-                                          {role.map((data, ind) => {
-                                            return (
-                                              <option
-                                                style={{ fontSize: "13px" }}
-                                                key={ind}
-                                                value={data}
-                                              >
-                                                {data}
-                                              </option>
-                                            );
-                                          })}
-                                        </select>
-                                      ) : (
-                                        <div className="w-[60%] md:w-[70%] border-[1px] border-gray-200 rounded-sm p-[2px]">
-                                          {role}
-                                        </div>
-                                      )}
-                                    </div>
-                                  )}
-                                </div>
-
-                                <hr className="bg-[#ccc] mt-2 " />
-                                <div className="flex items-center mt-3 gap-2 text-white">
-                                  <button
-                                    onClick={() => handlePublicTemplate(item)}
-                                    className="px-4 py-1.5 text-white rounded shadow-md text-center focus:outline-none "
-                                    style={{
-                                      backgroundColor: modalSubmitBtnColor
-                                    }}
-                                  >
-                                    Submit
-                                  </button>
-                                  <button
-                                    onClick={handleClose}
-                                    className="px-4 py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
-                                    style={{
-                                      backgroundColor: modalCancelBtnColor
-                                    }}
-                                  >
-                                    No
-                                  </button>
-                                </div>
-                              </div>
-                            </ModalUi>
-                          )}
-                          {isPublicProfile[item.objectId] && (
-                            <ModalUi
-                              isOpen
-                              title={"Public url"}
-                              handleClose={() => {
-                                setIsPublicProfile({});
-                              }}
-                              reduceWidth={"md:min-w-[440px] md:max-w-[400px]"}
-                            >
-                              <div className="m-[20px]">
-                                {publicUserName ? (
-                                  <div className="font-normal text-black">
-                                    <p>
-                                      Here’s your public URL. Copy or share it
-                                      with the signer, and you will be able to
-                                      see all your publicly set templates.
-                                    </p>
-                                    <div className=" flex items-center gap-5 mt-2  p-[2px] w-[75%]">
-                                      <span className="font-bold">
-                                        Public Url :{" "}
-                                      </span>
-                                      <span
-                                        onClick={() => copytoProfileLink()}
-                                        className="underline underline-offset-2 cursor-pointer"
-                                      >{`https://opensign.me/${publicUserName}`}</span>
-                                    </div>
-                                  </div>
-                                ) : (
-                                  <div className="font-normal text-black">
-                                    <p>
-                                      Please add your public URL, and you will
-                                      be able to make a public template.
-                                    </p>
-                                    <button
-                                      className="px-4 py-1.5 mt-3 text-white rounded shadow-md text-center focus:outline-none "
-                                      style={{
-                                        backgroundColor: modalSubmitBtnColor
-                                      }}
-                                      onClick={() => navigate("/profile")}
-                                    >
-                                      Add
-                                    </button>
+                                          Select...
+                                        </option>
+                                        {role.map((data, ind) => {
+                                          return (
+                                            <option
+                                              style={{ fontSize: "13px" }}
+                                              key={ind}
+                                              value={data}
+                                            >
+                                              {data}
+                                            </option>
+                                          );
+                                        })}
+                                      </select>
+                                    ) : (
+                                      <div className="w-[60%] md:w-[70%] border-[1px] border-gray-200 rounded-sm p-[2px]">
+                                        {role}
+                                      </div>
+                                    )}
                                   </div>
                                 )}
                               </div>
-                            </ModalUi>
-                          )}
-                        </td>
-                      )}
+
+                              <hr className="bg-[#ccc] mt-2 " />
+                              <div className="flex items-center mt-3 gap-2 text-white">
+                                <button
+                                  onClick={() => handlePublicTemplate(item)}
+                                  className="px-4 py-1.5 text-white rounded shadow-md text-center focus:outline-none "
+                                  style={{
+                                    backgroundColor: modalSubmitBtnColor
+                                  }}
+                                >
+                                  Submit
+                                </button>
+                                <button
+                                  onClick={handleClose}
+                                  className="px-4 py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
+                                  style={{
+                                    backgroundColor: modalCancelBtnColor
+                                  }}
+                                >
+                                  No
+                                </button>
+                              </div>
+                            </div>
+                          </ModalUi>
+                        )}
+                        {isPublicProfile[item.objectId] && (
+                          <ModalUi
+                            isOpen
+                            title={"Public url"}
+                            handleClose={() => {
+                              setIsPublicProfile({});
+                            }}
+                            reduceWidth={"md:min-w-[440px] md:max-w-[400px]"}
+                          >
+                            <div className="m-[20px]">
+                              {publicUserName ? (
+                                <div className="font-normal text-black">
+                                  <p>
+                                    Here’s your public URL. Copy or share it
+                                    with the signer, and you will be able to see
+                                    all your publicly set templates.
+                                  </p>
+                                  <div className=" flex items-center gap-5 mt-2  p-[2px] w-[75%]">
+                                    <span className="font-bold">
+                                      Public Url :{" "}
+                                    </span>
+                                    <span
+                                      onClick={() => copytoProfileLink()}
+                                      className="underline underline-offset-2 cursor-pointer"
+                                    >{`https://opensign.me/${publicUserName}`}</span>
+                                  </div>
+                                </div>
+                              ) : (
+                                <div className="font-normal text-black">
+                                  <p>
+                                    Please add your public URL, and you will be
+                                    able to make a public template.
+                                  </p>
+                                  <button
+                                    className="px-4 py-1.5 mt-3 text-white rounded shadow-md text-center focus:outline-none "
+                                    style={{
+                                      backgroundColor: modalSubmitBtnColor
+                                    }}
+                                    onClick={() => navigate("/profile")}
+                                  >
+                                    Add
+                                  </button>
+                                </div>
+                              )}
+                            </div>
+                          </ModalUi>
+                        )}
+                      </td>
+                      {/* )} */}
                     </tr>
                   )
                 )}
diff --git a/apps/OpenSignServer/cloud/parsefunction/CreatePublicTemplate.js b/apps/OpenSignServer/cloud/parsefunction/CreatePublicTemplate.js
index b7b5fb0b8..c99b878c2 100644
--- a/apps/OpenSignServer/cloud/parsefunction/CreatePublicTemplate.js
+++ b/apps/OpenSignServer/cloud/parsefunction/CreatePublicTemplate.js
@@ -3,7 +3,6 @@ export default async function CreatePublicTemplate(request) {
   const ispublic = request.params.ispublic;
   const publicrole = request.params.publicrole;
   try {
-    console.log('session token', request);
     if (!request?.user) {
       throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
     } else {