Fix for org repo password flushing and file save as..