I've had no luck with either, I tried the workaround with web version but once logged in and switched back to account setup, it just sits there loading saying waiting for flikr authorization to complete.
I never considered changing default browser with firefox but pasting the url with the api key gave me the same result as the full web version, just loading forever once logged in.... Now I can't setup yahoo or google emails either.