Save -> load. This problem should be solved in the next version.
It is not necessary. Simply if you save in the situation you mention above, reloading that save should fix it. If it doesn't, you are one of the few who are able to make the quest go crazy. After +20 different games, I have not been able to reproduce a bug that happens to very few people... But I hope it will be completely fixed in the next version as I have put more checks at the point where you are asked to do that rank quest.
If the error still persists, you can join Discord and send me your save-file via dm and I'll fix it in a moment.