Later the Protestant leader John Calvin was based in Geneva from 1536 to his death in 1564 . The Protestant leader John Calvin was based in Geneva from 1536 to his death in 1564 ( save for an exile from 1538 to 1541 ) and became the spiritual leader of the city .