diff --git a/internal/handler/servis.go b/internal/handler/servis.go
index 56e537b..d11285a 100644
--- a/internal/handler/servis.go
+++ b/internal/handler/servis.go
@@ -662,6 +662,7 @@ type PodaciOtpremnice struct {
 	ServisniDelovi []model.ServisniDeoSaArtiklom
 	UkupnoDelovi   float64
 	PreostaloSve   float64
+	ImaAvans       bool
 	Klijent        *model.Klijent
 	KlijentNaziv   string
 	TehnicarNaziv  string
@@ -725,11 +726,13 @@ func (h *Handler) StampaOtpremnice(w http.ResponseWriter, r *http.Request) {
 		ukupnoDelovi += d.Ukupno()
 	}
 	var preostaloSve float64
+	var imaAvans bool
 	if nalog.CenaKonacna != nil {
 		ukupnoSve := *nalog.CenaKonacna + ukupnoDelovi
 		avans := 0.0
-		if nalog.Avans != nil {
+		if nalog.Avans != nil && *nalog.Avans > 0 {
 			avans = *nalog.Avans
+			imaAvans = true
 		}
 		preostaloSve = ukupnoSve - avans
 		if preostaloSve < 0 {
@@ -742,6 +745,7 @@ func (h *Handler) StampaOtpremnice(w http.ResponseWriter, r *http.Request) {
 		ServisniDelovi: delovi,
 		UkupnoDelovi:   ukupnoDelovi,
 		PreostaloSve:   preostaloSve,
+		ImaAvans:       imaAvans,
 		Klijent:        klijent,
 		KlijentNaziv:   klijentNaziv,
 		TehnicarNaziv:  tehnicarNaziv,
diff --git a/web/templates/stranice/servis_forma.html b/web/templates/stranice/servis_forma.html
index 3fcadee..ad35bf0 100644
--- a/web/templates/stranice/servis_forma.html
+++ b/web/templates/stranice/servis_forma.html
@@ -179,7 +179,7 @@
                                 placeholder="0" style="width:100%;">
                         </div>
                         <div>
-                            <label class="polje-labela">Konačna cena</label>
+                            <label class="polje-labela">Cena rada</label>
                             <input type="number" name="cena_konacna" min="0" step="0.01"
                                 value="{{if .Nalog.CenaKonacna}}{{.Nalog.CenaKonacna}}{{end}}"
                                 placeholder="0" style="width:100%;">
@@ -218,6 +218,7 @@ function toggleGarancija(chk) {
     var input = document.getElementById('garancija_do_input');
     var hidden = document.getElementById('bez_garancije_val');
     if (chk.checked) {
+        if (input.value) input.dataset.sacuvano = input.value;
         input.value = '';
         input.disabled = true;
         input.style.opacity = '0.4';
@@ -225,6 +226,7 @@ function toggleGarancija(chk) {
     } else {
         input.disabled = false;
         input.style.opacity = '1';
+        if (input.dataset.sacuvano) input.value = input.dataset.sacuvano;
         hidden.value = '0';
     }
 }
diff --git a/web/templates/stranice/servis_otpremnica.html b/web/templates/stranice/servis_otpremnica.html
index 36a939a..f6e8246 100644
--- a/web/templates/stranice/servis_otpremnica.html
+++ b/web/templates/stranice/servis_otpremnica.html
@@ -205,7 +205,7 @@
                     <td class="desno">{{printf "%.2f" .UkupnoDelovi}} din</td>
                 </tr>
                 {{end}}
-                {{if .Nalog.Avans}}
+                {{if .ImaAvans}}
                 <tr>
                     <td>Avans (plaćeno)</td>
                     <td class="desno">− {{.Nalog.AvansStr}} din</td>
diff --git a/web/templates/stranice/servis_stampa.html b/web/templates/stranice/servis_stampa.html
index 71d50f6..ad54739 100644
--- a/web/templates/stranice/servis_stampa.html
+++ b/web/templates/stranice/servis_stampa.html
@@ -209,7 +209,7 @@
                 <div class="cena-vrednost">{{if .Nalog.Avans}}{{.Nalog.AvansStr}} din{{else}}—{{end}}</div>
             </div>
             <div class="cena-blok cena-konacna">
-                <div class="cena-labela">Konačna cena</div>
+                <div class="cena-labela">Cena rada</div>
                 <div class="cena-vrednost">{{if .Nalog.CenaKonacna}}{{.Nalog.CenaKonacnaStr}} din{{else}}—{{end}}</div>
             </div>
         </div>