diff --git a/Dockerfile b/Dockerfile
index 53affc4..2dcbcd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,7 +62,7 @@
 # install Roller WAR as ROOT.war, create data dirs
 
 WORKDIR /usr/local/roller
-COPY --from=builder /project/app/target/roller.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=builder /tmp/roller/app/target/roller.war /usr/local/tomcat/webapps/ROOT.war
 RUN mkdir -p data/mediafiles data/searchindex
 
 # download PostgreSQL and MySQL drivers plus Mail and Activation JARs
@@ -81,4 +81,4 @@
 RUN chmod -R g+rw /usr/local/tomcat
 
 WORKDIR /usr/local/tomcat
-ENTRYPOINT /usr/local/tomcat/bin/entry-point.sh
\ No newline at end of file
+ENTRYPOINT /usr/local/tomcat/bin/entry-point.sh
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
index 10a91fc..5f91f8d 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
@@ -40,7 +40,7 @@
             <%-- special case for front page blog --%>
             <s:elseif test="#pd.name == 'site.frontpage.weblog.handle'">
                 <s:select name="%{#pd.name}" label="%{getText(#pd.key)}" value="%{properties[#pd.name].value}"
-                          list="weblogs" listKey="name" listValueKey="handle"/>
+                          list="weblogs" listKey="handle" listValueKey="name"/>
             </s:elseif>
 
             <%-- "string" type means use a simple textbox --%>
@@ -59,12 +59,10 @@
             <s:elseif test="#pd.type == 'boolean'">
 
                 <s:if test="properties[#pd.name].value == 'true'">
-                    <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}"
-                                fieldValue="true" checked="true" onchange="formChanged()"/>
+                    <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}" checked="true" onchange="formChanged()"/>
                 </s:if>
                 <s:if test="properties[#pd.name].value != 'true'">
-                    <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}"
-                                fieldValue="false" onchange="formChanged()"/>
+                    <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}" onchange="formChanged()"/>
                 </s:if>
 
             </s:elseif>