EDIT: GREAT! I didn't see your last/edited post but I'm also pretty sure it's fixed
Okay, I just UN-DO'd my changes, cleared my browser cache, closed my browser and re-opened. I went to my website, changed url into oc-admin url in browser and logged into Admin. I surfed around a bit and pressed Log Out. In the page that followed I pressed the link "Back to Spulleboel" and I was redirected to my website front page as expected. I pressed login and got redirected to my login page, I entered my credentials and I IMMEDIATELY got redirected to the Admin Login page......meaning my issue was there again.
I RE-DID my fix again, followed the EXACT same routine and after login I actually get logged in as it should!
For now I have to say my fix works, at least for me, and I am pretty sure if it makes a difference for me it will most likely make a difference for others as well.
What browser you are using?
I have tested now with Edge and I will do the same with Opera v28.0.1750.48 (newer version is not working correct for me with window-scroll script function as is not with Chrome latest version)
Regards,
Eric