Fix login variables not being properly passed