diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs
index 3910e1309..1626939cc 100644
--- a/src/Handler/LMS.hs
+++ b/src/Handler/LMS.hs
@@ -378,8 +378,8 @@ mkLmsTable isAdmin (Entity qid quali) acts cols psValidator = do
   now <- liftIO getCurrentTime
   -- lookup all companies 
   cmpMap <- memcachedBy (Just . Right $ 5 * diffMinute) ("CompanyDictionary"::Text) $ do 
-    cmps <- selectList [] [Asc CompanyId]
-    return $ Map.fromAscList $ fmap (\c -> (entityKey c, entityVal c)) cmps
+    cmps <- selectList [] [Asc CompanyShorthand]
+    return $ Map.fromList $ fmap (\c -> (entityKey c, entityVal c)) cmps
   let        
     nowaday = utctDay now
     -- mbRenewal = addGregorianDurationClip <$> qualificationRefreshWithin quali <*> Just nowaday
@@ -556,7 +556,7 @@ postLmsR sid qsh = do
               let icnSuper = text2markup " " <> icon IconSupervisor
                   cs =  [ (cmpName, cmpSpr) 
                         | Entity _ UserCompany{userCompanyCompany=cmpId, userCompanySupervisor=cmpSpr} <- cmps
-                        , let cmpName = maybe cmpId companyName $ Map.lookup cmpId cmpMap                        
+                        , let cmpName = maybe (unCompanyKey cmpId) companyName $ Map.lookup cmpId cmpMap                        
                         ]
                   companies = intercalate (text2markup ", ") $
                     (\(cmpName, cmpSpr) -> text2markup (CI.original cmpName) <> bool mempty icnSuper cmpSpr) <$> cs
diff --git a/src/Handler/Qualification.hs b/src/Handler/Qualification.hs
index c4b3d64e0..df337047d 100644
--- a/src/Handler/Qualification.hs
+++ b/src/Handler/Qualification.hs
@@ -314,8 +314,8 @@ mkQualificationTable isAdmin (Entity qid quali) acts cols psValidator = do
   now <- liftIO getCurrentTime  
   -- lookup all companies   
   cmpMap <- memcachedBy (Just . Right $ 5 * diffMinute) ("CompanyDictionary"::Text) $ do 
-    cmps <- selectList [] [Asc CompanyId]
-    return $ Map.fromAscList $ fmap (\c -> (entityKey c, entityVal c)) cmps
+    cmps <- selectList [] [Asc CompanyShorthand]
+    return $ Map.fromList $ fmap (\c -> (entityKey c, entityVal c)) cmps
   let
     nowaday = utctDay now
     mbRenewal = addGregorianDurationClip <$> qualificationRefreshWithin quali <*> Just nowaday
@@ -505,7 +505,7 @@ postQualificationR sid qsh = do
               let icnSuper = text2markup " " <> icon IconSupervisor
                   cs =  [ (cmpName, cmpSpr) 
                         | Entity _ UserCompany{userCompanyCompany=cmpId, userCompanySupervisor=cmpSpr} <- cmps                        
-                        , let cmpName = maybe cmpId companyName $ Map.lookup cmpId cmpMap
+                        , let cmpName = maybe (unCompanyKey cmpId) companyName $ Map.lookup cmpId cmpMap
                         ]
                   companies = intercalate (text2markup ", ") $
                     (\(cmpName, cmpSpr) -> text2markup (CI.original cmpName) <> bool mempty icnSuper cmpSpr) <$> cs