diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d50674559..b32af4f80 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4921,10 +4921,10 @@ bool pubkey2addr(char *destaddr,uint8_t *pubkey33);
 UniValue setpubkey(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ);
-    if ( fHelp || params.size() > 1 )
+    if ( fHelp || params.size() != 1 )
         throw runtime_error(
         "setpubkey\n"
-        "\nSets the -pubkey if the daemon was not started with it, if it was already set, it returns the pubkey.\n"
+        "\nSets the -pubkey if the daemon was not started with it, if it was already set, it returns the pubkey, and its Raddress.\n"
         "\nArguments:\n"
         "1. \"pubkey\"         (string) pubkey to set.\n"
         "\nResult:\n"
@@ -4938,10 +4938,16 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
         + HelpExampleRpc("setpubkey", "02f7597468703c1c5c8465dd6d43acaae697df9df30bed21494d193412a1ea193e")
       );
 
+#ifdef ENABLE_WALLET
     LOCK2(cs_main, pwalletMain ? &pwalletMain->cs_wallet : NULL);
+#else
+    LOCK(cs_main);
+#endif
 
     char Raddress[18];
     uint8_t pubkey33[33];
+    extern uint8_t NOTARY_PUBKEY33[];
+    extern std::string NOTARY_PUBKEY;
     if ( NOTARY_PUBKEY33[0] == 0 ) {
         if (strlen(params[0].get_str().c_str()) == 66) {
             decode_hex(pubkey33,33,(char *)params[0].get_str().c_str());
@@ -4954,39 +4960,26 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
                 if (isValid)
                 {
                     CTxDestination dest = address.Get();
+                    string currentAddress = address.ToString();
+                    result.push_back(Pair("address", currentAddress));
+#ifdef ENABLE_WALLET
                     isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO;
-                    if ( mine == ISMINE_NO ) {
-                        result.push_back(Pair("WARNING", "privkey for this pubkey is not imported to wallet!"));
-                    } else {
-                        result.push_back(Pair("ismine", "true"));
-                        std::string notaryname;
-                        if ( (IS_STAKED_NOTARY= StakedNotaryID(notaryname, Raddress)) > -1 ) {
-                            result.push_back(Pair("IsNotary", notaryname));
-                            IS_KOMODO_NOTARY = 0;
-                        }
-                    }
-                    NOTARY_PUBKEY = params[0].get_str();
-                    decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str());
-                    USE_EXTERNAL_PUBKEY = 1;
-                    NOTARY_ADDRESS = address.ToString();
-                  } else {
-                    result.push_back(Pair("error", "pubkey entered is invalid."));
+                    result.push_back(Pair("ismine", (mine & ISMINE_SPENDABLE) ? true : false));
+#endif
                 }
+                NOTARY_PUBKEY = params[0].get_str();
+                decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str());
             }
         } else {
             result.push_back(Pair("error", "pubkey is wrong length, must be 66 char hex string."));
         }
     } else {
-        if ( NOTARY_ADDRESS.empty() ) {
-          pubkey2addr((char *)Raddress,(uint8_t *)NOTARY_PUBKEY33);
-          NOTARY_ADDRESS.assign(Raddress);
-        }
-        result.push_back(Pair("error", "Can only set pubkey once, to change it you need to restart your daemon."));
-    }
-    if ( NOTARY_PUBKEY33[0] != 0 && !NOTARY_ADDRESS.empty() ) {
-        result.push_back(Pair("address", NOTARY_ADDRESS));
-        result.push_back(Pair("pubkey", NOTARY_PUBKEY));
+        result.push_back(Pair("error", "Can only set pubkey once, to change it you need to restart your daemon, pubkey in use is below."));
+        pubkey2addr((char *)Raddress,(uint8_t *)NOTARY_PUBKEY33);
+        std::string address_ret.assign(Raddress);
+        result.push_back(Pair("address",address_ret));
     }
+    result.push_back(Pair("pubkey", NOTARY_PUBKEY));
     return result;
 }