diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index f15ef1819..448e4bc37 100644
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -216,9 +216,8 @@ class CCLIFileImport(SongImport):
         for author in author_list:
             separated = author.split(u',')
             if len(separated) > 1:
-                self.addAuthor(u' '.join(reversed(separated)))
-            else:
-                self.addAuthor(author)
+                author = u' '.join(map(unicode.strip, reversed(separated)))
+            self.addAuthor(author.strip())
         self.topics = [topic.strip() for topic in song_topics.split(u'/t')]
         return self.finish()