I think the DC FO is over near the Navy Yard, not in the JEH Building.
I don't want to date myself too much but back in the 60's wasn't it on the corner of Constitution and something? Maybe not the JEH but FBI HQ since the great man in his frilly little things was still prancing around for Clyde.