In the first photo, as Korvettenkapit�n, his decorations include the 1934 Honor Cross indicating he was in the military during World War 1. It's the version for non-combatants without swords - so, he didn't see action but if he perfomed administrative duties at the time, that makes sense. The WW1 service reconciles with 1.4.1916.
The long service awards would indicate 22 years service at the time of the photo. If 1938, his 25th jubilee would be 1941. And, he's an administration officer.
Someone will hopefully have a Imperial, Reichsmarine or Kriegsmarine Rangliste or other archival resources to get more biographical information.
You may have found this photo as well showing Voigt (in glasses looking a tad weathered and older) with Topp.
In any case, for the moment, I think Voigt is a candidate.
