diff --git a/hledger/Hledger/Cli/Utils.hs b/hledger/Hledger/Cli/Utils.hs
index 8dc171092..ddb1e693b 100644
--- a/hledger/Hledger/Cli/Utils.hs
+++ b/hledger/Hledger/Cli/Utils.hs
@@ -92,7 +92,7 @@ pivot tag j = j{jtxns = map pivotTrans . jtxns $ j}
   pivotTrans t = t{tpostings = map pivotPosting . tpostings $ t}
   pivotPosting p
     | Just (_ , value) <- tagTuple = p{paccount = value, porigin = Just $ originalPosting p}
-    | _                <- tagTuple = p{paccount = T.pack ""}
+    | _                <- tagTuple = p{paccount = T.pack "", porigin = Just $ originalPosting p}
    where tagTuple = find ((tag ==) . fst) . postingAllImplicitTags $ p
 
 -- | Apply the anonymisation transformation on a journal, if option is present
diff --git a/tests/misc/pivot.test b/tests/misc/pivot.test
index 1dbe24196..5779cf816 100644
--- a/tests/misc/pivot.test
+++ b/tests/misc/pivot.test
@@ -54,6 +54,20 @@ hledger -f- --pivot TAG reg '^Account2$' '^fun$' not:hidden
                                 value                       -1 EUR         1 EUR
 >>>=0
 
+# We should be able to query on original account names
+hledger -f- --pivot expenses reg not:liabilities
+<<<
+2017/1/1 prepay
+    assets           $1500  ; expenses:a
+    assets            $100  ; expenses:b
+    assets              $5  ; expenses:c
+    liabilities     $-1605
+>>>
+2017/01/01 prepay               a                            $1500         $1500
+                                b                             $100         $1600
+                                c                               $5         $1605
+>>>=0
+
 # pivot for implicit tag desc (technical sample)
 hledger -f- --pivot description reg -M
 <<<