diff --git a/src/outputtype.cpp b/src/outputtype.cpp
--- a/src/outputtype.cpp
+++ b/src/outputtype.cpp
@@ -53,10 +53,12 @@
                                              OutputType type) {
     // Add script to keystore
     keystore.AddCScript(script);
+    ScriptHash sh(script);
     // Note that scripts over 520 bytes are not yet supported.
     switch (type) {
         case OutputType::LEGACY:
-            return ScriptHash(script);
+            keystore.AddCScript(GetScriptForDestination(sh));
+            return sh;
         default:
             assert(false);
     }