diff --git a/src/addresstype.cpp b/src/addresstype.cpp
index f199d1b479446..3ac73ade7cc48 100644
--- a/src/addresstype.cpp
+++ b/src/addresstype.cpp
@@ -11,7 +11,7 @@
 #include <script/solver.h>
 #include <uint256.h>
 #include <util/hash_type.h>
-
+#include <src/groestlcoin.cpp>
 #include <cassert>
 #include <vector>
 
@@ -54,12 +54,11 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
     switch (whichType) {
     case TxoutType::PUBKEY: {
         CPubKey pubKey(vSolutions[0]);
-        if (!pubKey.IsValid()) {
-            addressRet = CNoDestination(scriptPubKey);
-        } else {
-            addressRet = PubKeyDestination(pubKey);
-        }
-        return false;
+        if (!pubKey.IsValid())
+            return false;
+
+        addressRet = PKHash(pubKey);
+        return true;
     }
     case TxoutType::PUBKEYHASH: {
         addressRet = PKHash(uint160(vSolutions[0]));
diff --git a/src/core_write.cpp b/src/core_write.cpp
index 7cf019a42e78d..eb12e719eafd6 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -162,7 +162,7 @@ void ScriptToUniv(const CScript& script, UniValue& out, bool include_hex, bool i
     std::vector<std::vector<unsigned char>> solns;
     const TxoutType type{Solver(script, solns)};
 
-    if (include_address && ExtractDestination(script, address) && type != TxoutType::PUBKEY) {
+    if (include_address && ExtractDestination(script, address)) {
         out.pushKV("address", EncodeDestination(address));
     }
     out.pushKV("type", GetTxnOutputType(type));