diff --git a/app/models/wds_server.rb b/app/models/wds_server.rb
index 5abf7934bf5bb15b8077159eb6fda24530accbe5..7a31b4197fbb69ca4e3219aae74c2d35aa3e46e1 100644
--- a/app/models/wds_server.rb
+++ b/app/models/wds_server.rb
@@ -59,7 +59,9 @@ class WdsServer < ApplicationRecord
   end
 
   def client(host)
-    clients.find { |c| [host.mac, host.name].include? c[:device_id] }
+    clients.find do |c|
+      [host.mac.upcase.tr(':', '-'), host.name].include?(c[:device_id]) || [host.name, host.shortname].include?(c[:device_name])
+    end
   end
 
   def boot_images