diff --git a/CHANGELOG b/CHANGELOG
index 701e551..96ac7a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@ version 0.19 (xx Feb 2012)
  - improved the pdf metadata, as reported by S. Wunsch (launchpad bug #922476).
  - fixed a footersymbol bug in the casual style when no mobile number was given,
  as reported by S. Wunsch (launchpad bug #922470).
+ - fixed a display bug when an address was given without postcode/city, as reported by
+ O.Shaneh (launchpad bug #670263).
 
 version 0.18 (05 Feb 2012)
  - corrected the handling of pdf bookmarks, as suggested on stackexchange by
diff --git a/examples/template-es.pdf b/examples/template-es.pdf
index 979d43b..a1034bc 100644
Binary files a/examples/template-es.pdf and b/examples/template-es.pdf differ
diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf
index eaa1466..830560a 100644
Binary files a/examples/template-zh.pdf and b/examples/template-zh.pdf differ
diff --git a/examples/template.pdf b/examples/template.pdf
index 606a7e1..6a4d37b 100644
Binary files a/examples/template.pdf and b/examples/template.pdf differ
diff --git a/examples/template_banking_black.pdf b/examples/template_banking_black.pdf
index 8c85088..5557382 100644
Binary files a/examples/template_banking_black.pdf and b/examples/template_banking_black.pdf differ
diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf
index db62c5d..eb5cc18 100644
Binary files a/examples/template_banking_red.pdf and b/examples/template_banking_red.pdf differ
diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf
index dd5a331..460f165 100644
Binary files a/examples/template_casual_orange.pdf and b/examples/template_casual_orange.pdf differ
diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf
index 651c80d..68b159e 100644
Binary files a/examples/template_classic_green.pdf and b/examples/template_classic_green.pdf differ
diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf
index d7a349b..6f1d5cc 100644
Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ
diff --git a/moderncvstylebanking.sty b/moderncvstylebanking.sty
index f6c8d56..05f5941 100644
--- a/moderncvstylebanking.sty
+++ b/moderncvstylebanking.sty
@@ -110,7 +110,7 @@
     % detailed information
     \color{color2}\addressfont%
     \ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle[]{\addresssymbol\@addressstreet}%
-      \ifthenelse{\isundefined{\@addresscity}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle}%
+      \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle}% if \addresstreet is defined, \addresscity will always be defined but could be empty
     \ifthenelse{\isundefined{\@mobile}}{}{\addtomaketitle[]{\mobilesymbol\@mobile}}%
     \ifthenelse{\isundefined{\@phone}}{}{\addtomaketitle{\phonesymbol\@phone}}%
     \ifthenelse{\isundefined{\@fax}}{}{\addtomaketitle{\faxsymbol\@fax}}%
diff --git a/moderncvstylecasual.sty b/moderncvstylecasual.sty
index 12b7ff8..d0f7a01 100644
--- a/moderncvstylecasual.sty
+++ b/moderncvstylecasual.sty
@@ -71,7 +71,7 @@
         \centering%
         \color{color2}\addressfont%
         \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}%
-          \ifthenelse{\isundefined{\@addresscity}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}%
+          \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
         \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}%
         \ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}%
         \ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}%
diff --git a/moderncvstyleclassic.sty b/moderncvstyleclassic.sty
index 59266c1..684cc23 100644
--- a/moderncvstyleclassic.sty
+++ b/moderncvstyleclassic.sty
@@ -90,8 +90,8 @@
   \savebox{\maketitledetailsbox}{%
     \addressfont\color{color2}%
     \begin{tabular}[b]{@{}r@{}}%
-      \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet}%
-      \ifthenelse{\isundefined{\@addresscity}}{}{\maketitledetailsnewline\@addresscity}%
+      \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet%
+        \ifthenelse{\equal{\@addresscity}{}}{}{\maketitledetailsnewline\@addresscity}}% if \addresstreet is defined, \addresscity will always be defined but could be empty
       \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol\@mobile}%
       \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol\@phone}%
       \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol\@fax}%
diff --git a/moderncvstyleoldstyle.sty b/moderncvstyleoldstyle.sty
index 29441f8..8f5f9f9 100644
--- a/moderncvstyleoldstyle.sty
+++ b/moderncvstyleoldstyle.sty
@@ -129,8 +129,8 @@
     {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
   % optional details
   \makeinfo{%
-    \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet}%
-    \ifthenelse{\isundefined{\@addresscity}}{}{\maketitledetailsnewline\@addresscity}%
+    \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet%
+      \ifthenelse{\equal{\@addresscity}{}}{}{\maketitledetailsnewline\@addresscity}}% if \addresstreet is defined, \addresscity will always be defined but could be empty
     \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol\@mobile}%
     \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol\@phone}%
     \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol\@fax}%