Fixed string merging; '<<' touches also password var
Introducing roster flag to separat diaspora user