Fixed partial handling, stupid log-in issues