Fixes problem with missing firstname and lastname ..

Related to #69