diff --git a/src/main/java/org/javaswift/joss/client/core/AbstractAccount.java b/src/main/java/org/javaswift/joss/client/core/AbstractAccount.java
index 539382cb..ec4e6cb2 100644
--- a/src/main/java/org/javaswift/joss/client/core/AbstractAccount.java
+++ b/src/main/java/org/javaswift/joss/client/core/AbstractAccount.java
@@ -70,7 +70,7 @@ public PaginationMap getPaginationMap(int pageSize) {
 
     @Override
     public String getHashPassword() {
-        return (String)getMetadata().get(HashPassword.X_ACCOUNT_TEMP_URL_KEY);
+        return (String)getMetadata(HashPassword.X_ACCOUNT_TEMP_URL_KEY);
     }
 
     @Override
diff --git a/src/main/java/org/javaswift/joss/client/website/AbstractWebsite.java b/src/main/java/org/javaswift/joss/client/website/AbstractWebsite.java
index 13552e6a..93ffffcb 100644
--- a/src/main/java/org/javaswift/joss/client/website/AbstractWebsite.java
+++ b/src/main/java/org/javaswift/joss/client/website/AbstractWebsite.java
@@ -35,8 +35,7 @@ public Website create() {
     }
 
     protected Object getHeader(String metadataHeaderName) {
-        Map<String, Object> metadata = getMetadata();
-        return metadata.get(metadataHeaderName);
+        return getMetadata(metadataHeaderName);
     }
 
     protected StoredObject getStoredObject(String metadataHeaderName) {
@@ -45,9 +44,7 @@ protected StoredObject getStoredObject(String metadataHeaderName) {
     }
 
     protected void setHeader(WebsiteHeader header) {
-        Map<String, Object> metadata = getMetadata();
-        metadata.put(header.getMetadataHeader(), header.getHeaderValue());
-        setMetadata(metadata);
+        setAndSaveMetadata(header.getMetadataHeader(), header.getHeaderValue());
     }
 
     public String getMetadataHeader(String websiteHeader) {