diff --git a/template/script.sh.erb b/template/script.sh.erb
index 13ab534..a9495d4 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -40,6 +40,10 @@ if [[ -f "$CPP_FILE" ]]; then
     mv "$CPP_FILE".new "$CPP_FILE"
   fi
 
+# Copy machine settings file
+mkdir -p "$CODE_SERVER_DATAROOT/Machine"
+cp "$CODE_SERVER_MACHINE_SETTINGS" "$CODE_SERVER_DATAROOT/Machine/settings.json"
+
 #
 # Start Code Server.
 #
diff --git a/view.html.erb b/view.html.erb
index e5bb85d..aabf699 100644
--- a/view.html.erb
+++ b/view.html.erb
@@ -23,7 +23,7 @@
 })();
 </script>
 
-<% if code_server_version == '4.8.3' %>
+<% if Gem::Version.new(code_server_version) >= Gem::Version.new('4.8.3') %>
 <form id="<%= form_id %>" action="/rnode/<%= host %>/<%= port %>/login?to=" method="post" target="_blank">
   <input type="hidden" name="password" value="<%= password %>">
 <% else %>