diff --git a/views/honkform.html b/views/honkform.html
index 1246b05..9dea0a3 100644
--- a/views/honkform.html
+++ b/views/honkform.html
@@ -9,10 +9,19 @@
 <details>
 <summary>more options</summary>
 <p>
-<label class=button id="donker">attach: {{ if .SavedFile }} {{ .SavedFile }} {{ else }} <input onchange="updatedonker();" type="file" name="donk"><span></span> {{ end }}</label>
-<input type="hidden" name="donkxid" value="{{ .SavedFile }}">
+<label class=button id="donker">attach: <input onchange="updatedonker();" type="file" name="donk"><span>{{ .SavedFile }}</span></label>
+<input type="hidden" id="saveddonkxid" name="donkxid" value="{{ .SavedFile }}">
 <p id="donkdescriptor"><label for=donkdesc>description:</label><br>
 <input type="text" name="donkdesc" value="{{ .DonkDesc }}" autocomplete=off>
+{{ with .SavedPlace }}
+<p><button id=checkinbutton type=button onclick="fillcheckin()">checkin</button>
+<div id=placedescriptor>
+	<p><label>name:</label><br><input type="text" name="placename" id=placenameinput value="{{ .Name }}">
+	<p><label>url:</label><br><input type="text" name="placeurl" id=placeurlinput value="{{ .Url }}">
+	<p><label>lat: </label><input type="text" size=9 name="placelat" id=placelatinput value="{{ .Latitude}}">
+	<label>lon: </label><input type="text" size=9 name="placelong" id=placelonginput value="{{ .Longitude }}">
+</div>
+{{ else }}
 <p><button id=checkinbutton type=button onclick="fillcheckin()">checkin</button>
 <div id=placedescriptor style="display: none">
 <p><label>name:</label><br><input type="text" name="placename" id=placenameinput value="">
@@ -20,6 +29,7 @@
 <p><label>lat: </label><input type="text" size=9 name="placelat" id=placelatinput value="">
 <label>lon: </label><input type="text" size=9 name="placelong" id=placelonginput value="">
 </div>
+{{ end }}
 <p><button id=addtimebutton type=button onclick="showelement('timedescriptor')">add time</button>
 <div id=timedescriptor style="display: none">
 <p><label for=timestart>start:</label><br>
diff --git a/views/honkpage.js b/views/honkpage.js
index 487d027..b417047 100644
--- a/views/honkpage.js
+++ b/views/honkpage.js
@@ -270,6 +270,8 @@ function updatedonker() {
 	el.children[1].textContent = el.children[0].value.slice(-20)
 	var el = document.getElementById("donkdescriptor")
 	el.style.display = ""
+	var el = document.getElementById("saveddonkxid")
+	el.value = ""
 }
 var checkinprec = 100.0
 var gpsoptions = {
diff --git a/web.go b/web.go
index 1f94576..7a8eade 100644
--- a/web.go
+++ b/web.go
@@ -980,6 +980,7 @@ func edithonkpage(w http.ResponseWriter, r *http.Request) {
 	templinfo["HonkCSRF"] = login.GetCSRF("honkhonk", r)
 	templinfo["Honks"] = honks
 	templinfo["Noise"] = noise
+	templinfo["SavedPlace"] = honk.Place
 	templinfo["ServerMessage"] = "honk edit"
 	templinfo["IsPreview"] = true
 	templinfo["UpdateXID"] = honk.XID