diff --git a/applications/luci-app-emby/luasrc/model/cbi/emby.lua b/applications/luci-app-emby/luasrc/model/cbi/emby.lua
index 0362a6a..513f6fd 100644
--- a/applications/luci-app-emby/luasrc/model/cbi/emby.lua
+++ b/applications/luci-app-emby/luasrc/model/cbi/emby.lua
@@ -25,7 +25,7 @@ o.rmempty = false
 o = s:option(Value, "http_port", translate("HTTP Port").."<b>*</b>")
 o.rmempty = false
 o.default = "8096"
-o.datatype = "http_port"
+o.datatype = "string"
 o:depends("hostnet", 0)
 
 o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
diff --git a/applications/luci-app-emby/luasrc/view/emby/status.htm b/applications/luci-app-emby/luasrc/view/emby/status.htm
index c214603..d99e2e9 100644
--- a/applications/luci-app-emby/luasrc/view/emby/status.htm
+++ b/applications/luci-app-emby/luasrc/view/emby/status.htm
@@ -18,14 +18,14 @@ local container_running = container_status == "running"
 if container_running then
     local port=util.trim(util.exec("/usr/libexec/istorec/emby.sh port"))
     if port == "" then
-        port="32400"
+        port="8096"
     end
 -%>
 <div class="cbi-value cbi-value-last">
     <label class="cbi-value-title">&nbsp;</label>
     <div class="cbi-value-field">
 
-    <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Emby%>" onclick="window.open('http://'+location.hostname+':<%=port%>/web/', '_blank')">
+    <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Emby%>" onclick="window.open('http://'+location.hostname+':<%=port%>', '_blank')">
     </div>
 </div>
 <% end %>
diff --git a/applications/luci-app-emby/root/etc/config/emby b/applications/luci-app-emby/root/etc/config/emby
index e3adb15..02cfc66 100644
--- a/applications/luci-app-emby/root/etc/config/emby
+++ b/applications/luci-app-emby/root/etc/config/emby
@@ -1,6 +1,6 @@
 config main
 	option 'hostnet' '0'
 	option 'http_port' '8096'
-	option 'image_name' 'emby/embyserver:latest'
+	option 'image_name' 'emby/embyserver'
 	option 'config_path' ''
 
diff --git a/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh b/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh
index 69adfa4..4ec8314 100755
--- a/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh
+++ b/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh
@@ -12,7 +12,7 @@ do_install() {
   local media=`uci get emby.@main[0].media_path 2>/dev/null`
   local cache=`uci get emby.@main[0].cache_path 2>/dev/null`
 
-  [ -z "$image_name" ] && image_name="embyinc/pms-docker:latest"
+  [ -z "$image_name" ] && image_name="emby/embyserver"
   echo "docker pull ${image_name}"
   docker pull ${image_name}
   docker rm -f emby
@@ -83,7 +83,7 @@ case ${ACTION} in
     docker ps --all -f 'name=emby' --format '{{.State}}'
   ;;
   "port")
-    docker ps --all -f 'name=jellyfin' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+    docker ps --all -f 'name=emby' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
   ;;
   *)
     usage