Merge "Fix API login after I7c957e1e"