diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.js
index 4e464d11c..19c6fd594 100644
--- a/apps/OpenSign/src/components/LoginGoogle.js
+++ b/apps/OpenSign/src/components/LoginGoogle.js
@@ -287,8 +287,9 @@ const GoogleSignInBtn = ({
                   <div>
                     <button
                       type="button"
-                      className="bg-[#17a2b8] p-2 text-white rounded mr-2"
+                      className="bg-[#17a2b8] p-2 text-white rounded"
                       onClick={() => handleSubmitbtn()}
+                      style={{ marginRight: 10 }}
                     >
                       Sign up
                     </button>
diff --git a/apps/OpenSign/src/routes/Login.js b/apps/OpenSign/src/routes/Login.js
index 35d93185a..4a472cb95 100644
--- a/apps/OpenSign/src/routes/Login.js
+++ b/apps/OpenSign/src/routes/Login.js
@@ -489,16 +489,13 @@ function Login(props) {
                         element.extended_class
                       );
                       localStorage.setItem("userpointer", element.userpointer);
-
-                      const extendedClass = Parse.Object.extend(
-                        element.extended_class
-                      );
-                      let query = new Parse.Query(extendedClass);
-                      query.equalTo("UserId", Parse.User.current());
-                      query.include("TenantId");
-                      await query.find().then(
-                        (results) => {
+                      const currentUser = Parse.User.current();
+                      await Parse.Cloud.run("getUserDetails", {
+                        email: currentUser.get("email")
+                      }).then(
+                        (result) => {
                           let tenentInfo = [];
+                          const results = [result];
                           if (results) {
                             let extendedInfo_stringify =
                               JSON.stringify(results);
@@ -756,14 +753,6 @@ function Login(props) {
                     element.extended_class
                   );
 
-                  // const extendedClass = Parse.Object.extend(
-                  //   element.extended_class
-                  // );
-                  // let query = new Parse.Query(extendedClass);
-                  // query.equalTo("UserId", Parse.User.current());
-                  // query.include("TenantId");
-                  // await query.find()
-
                   const currentUser = Parse.User.current();
                   await Parse.Cloud.run("getUserDetails", {
                     email: currentUser.get("email")