Added a fix for devise firstname and lastname