Bug fix and allow use of legacy form for non-Google account holders