BITMAG-1040 re-introduce fix for DB password leaks