diff --git a/exec/load/callsign.js b/exec/load/callsign.js
index 0f1a2a3d147c5fea4fe9d26e45d3d94508dc7a9a..f0325fdf05d64ea61beea5b8d1483472c4c0de26 100644
--- a/exec/load/callsign.js
+++ b/exec/load/callsign.js
@@ -79,8 +79,12 @@ var CallSign={
 					}
 					if(ret.class==undefined)
 						ret.qualifications=ret.type;
-					else
+					else {
 						ret.qualifications=ret.class;
+						m=ret.name.match(/^(.*), (.*)$/);
+						if(m)
+							ret.name=m[2]+' '+m[1];
+					}
 					return ret;
 				}
 			}